summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Makefile2
-rw-r--r--gopherfs.c4
-rw-r--r--netfs.c8
4 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 485ed94ae..06b2ff16b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-31 Manuel Menal <mmenal@hurdfr.org>
+
+ * Makefile (CFLAGS): Add -D_FILE_OFFSET_BITS=64
+ * netfs.c: revert previous changes.
+ * gopherfs.c (main): show "loop" output only when in
+ debug mode.
+
2002-04-15 Ben Asseltsine <ben@asselstine.com>
* args.c (parse_opt): new option to specify a port.
diff --git a/Makefile b/Makefile
index ed52f58d1..2315fc36d 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ makemode := server
target = gopherfs
CC = gcc
-CFLAGS = -Wall -g -D_GNU_SOURCE
+CFLAGS = -Wall -g -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
INCLUDES = -I.
SRCS = gopherfs.c args.c netfs.c gopher.c node.c
LCLHDRS = gopherfs.h
diff --git a/gopherfs.c b/gopherfs.c
index 7cd942b7e..3670290f4 100644
--- a/gopherfs.c
+++ b/gopherfs.c
@@ -85,7 +85,9 @@ main (int argc, char **argv)
if (debug_flag)
fprintf (stderr, "entering the main loop\n");
for (;;)
- fprintf (stderr, "loop\n");
+ if (debug_flag)
+ fprintf (stderr, "loop\n");
+
netfs_server_loop ();
/*NOT REACHED */
diff --git a/netfs.c b/netfs.c
index d9ee35668..8ce895195 100644
--- a/netfs.c
+++ b/netfs.c
@@ -378,7 +378,7 @@ error_t netfs_attempt_chflags (struct iouser *cred, struct node *node,
/* This should attempt to set the size of the file NODE (for user CRED) to
SIZE bytes long. */
error_t netfs_attempt_set_size (struct iouser *cred, struct node *node,
- loff_t size)
+ off_t size)
{
return EROFS;
}
@@ -386,7 +386,7 @@ error_t netfs_attempt_set_size (struct iouser *cred, struct node *node,
/* This should attempt to fetch filesystem status information for the remote
filesystem, for the user CRED. */
error_t netfs_attempt_statfs (struct iouser *cred, struct node *node,
- fsys_statfsbuf_t *st)
+ struct statfs *st)
{
return EOPNOTSUPP;
}
@@ -430,7 +430,7 @@ error_t netfs_attempt_readlink (struct iouser *user, struct node *node,
up to *LEN bytes. Put the data at DATA. Set *LEN to the amount
successfully read upon return. */
error_t netfs_attempt_read (struct iouser *cred, struct node *node,
- loff_t offset, size_t *len, void *data)
+ off_t offset, size_t *len, void *data)
{
error_t err;
int remote_fd;
@@ -455,7 +455,7 @@ error_t netfs_attempt_read (struct iouser *cred, struct node *node,
to *LEN bytes from DATA. Set *LEN to the amount seccessfully written upon
return. */
error_t netfs_attempt_write (struct iouser *cred, struct node *node,
- loff_t offset, size_t *len, void *data)
+ off_t offset, size_t *len, void *data)
{
return EROFS;
}