httpfs ChangeLog Makefile.am configure.in httpf...

[Samuel Thibault]

CVSROOT:        /cvsroot/hurdextras
Module name:    httpfs
Changes by:     Samuel Thibault <sthibaul>      13/01/14 10:47:05

Modified files:
        .              : ChangeLog Makefile.am configure.in httpfs.c 
                         httpfs.h netfs.c 

Log message:
        2012-09-30 Cyril Roelandt <address@hidden>
        
                * netfs.c (netfs_attempt_utimes): Copy atime and mtime timespec
                structures into node->nn_stat.st_atim/st_mtim.
                (netfs_attempt_set_size, netfs_attempt_statfs, 
netfs_attempt_read,
                netfs_attempt_write): Fix prototype.
        
        2006-01-12 Manuel Menal <address@hidden>
        
                * Makefile.am (httpfs_LDADD): correct linking order to fix 
pthread
                problem.
                * configure.in: update, add libxml2 dependency.
                * httpfs.h: define HTTPFS_SERVER_NAME/VERSION.
                * httpfs.c: export netfs_server_{name,version}.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/httpfs/ChangeLog?cvsroot=hurdextras&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/httpfs/Makefile.am?cvsroot=hurdextras&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/httpfs/configure.in?cvsroot=hurdextras&r1=1.1.1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/httpfs/httpfs.c?cvsroot=hurdextras&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/httpfs/httpfs.h?cvsroot=hurdextras&r1=1.1.1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/httpfs/netfs.c?cvsroot=hurdextras&r1=1.1.1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/hurdextras/httpfs/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ChangeLog   6 May 2002 11:34:11 -0000       1.4
+++ ChangeLog   14 Jan 2013 10:47:05 -0000      1.5
@@ -1,3 +1,18 @@
+2012-09-30 Cyril Roelandt <address@hidden>
+
+       * netfs.c (netfs_attempt_utimes): Copy atime and mtime timespec
+       structures into node->nn_stat.st_atim/st_mtim.
+       (netfs_attempt_set_size, netfs_attempt_statfs, netfs_attempt_read,
+       netfs_attempt_write): Fix prototype.
+
+2006-01-12 Manuel Menal <address@hidden>
+
+       * Makefile.am (httpfs_LDADD): correct linking order to fix pthread
+       problem.
+       * configure.in: update, add libxml2 dependency.
+       * httpfs.h: define HTTPFS_SERVER_NAME/VERSION.
+       * httpfs.c: export netfs_server_{name,version}.
+
 2002-05-06  James Morrison  <address@hidden>
 
        * NOTES: license corrections.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hurdextras/httpfs/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Makefile.am 15 Apr 2002 23:49:48 -0000      1.2
+++ Makefile.am 14 Jan 2013 10:47:05 -0000      1.3
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS=httpfs
 
-httpfs_LDADD=-lhurdbugaddr -lnetfs -lfshelp -lthreads -lports -liohelp -lxml2 
-lshouldbeinlibc
+httpfs_LDADD=$(LIBS) -lhurdbugaddr -lnetfs -lfshelp -lthreads -lports -liohelp 
-lshouldbeinlibc
 httpfs_SOURCES=httpfs.c \
        netfs.c \
        args.c \

Index: configure.in
===================================================================
RCS file: /cvsroot/hurdextras/httpfs/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -r1.1.1.1 -r1.2
--- configure.in        15 Apr 2002 19:25:41 -0000      1.1.1.1
+++ configure.in        14 Jan 2013 10:47:05 -0000      1.2
@@ -1,10 +1,16 @@
+AC_INIT(httpfs, 0.1)
+AC_CONFIG_SRCDIR(Makefile.am)
+AM_INIT_AUTOMAKE
 
+AC_PROG_CC
 
-AC_INIT(Makefile.am)
+PKG_CHECK_MODULES(HTTPFS, libxml-2.0)
 
-AM_INIT_AUTOMAKE(httpfs, 0.1, no-define)
+CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 $HTTPFS_CFLAGS"
+LIBS="$LIBS $HTTPFS_LIBS"
 
-AC_PROG_CC
+AC_SUBST(LIBS)
+AM_CONFIG_HEADER(config.h)
 
 AC_OUTPUT(
        Makefile

Index: httpfs.c
===================================================================
RCS file: /cvsroot/hurdextras/httpfs/httpfs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- httpfs.c    15 Apr 2002 23:49:48 -0000      1.2
+++ httpfs.c    14 Jan 2013 10:47:05 -0000      1.3
@@ -42,6 +42,9 @@
 struct httpfs *httpfs;         /* filesystem global pointer */
 volatile struct mapped_time_value *httpfs_maptime;
 
+char *netfs_server_name    = HTTPFS_SERVER_NAME;
+char *netfs_server_version = HTTPFS_SERVER_VERSION;
+
 int
 main (int argc, char **argv)
 {

Index: httpfs.h
===================================================================
RCS file: /cvsroot/hurdextras/httpfs/httpfs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -r1.1.1.1 -r1.2
--- httpfs.h    15 Apr 2002 19:25:42 -0000      1.1.1.1
+++ httpfs.h    14 Jan 2013 10:47:05 -0000      1.2
@@ -23,6 +23,11 @@
 
 #include <hurd/hurd_types.h>
 
+#include "config.h"
+
+#define HTTPFS_SERVER_NAME    PACKAGE
+#define HTTPFS_SERVER_VERSION VERSION
+
 /* declaration of global configuration parameters */
 extern int debug_flag;
 extern volatile struct mapped_time_value *httpfs_maptime;

Index: netfs.c
===================================================================
RCS file: /cvsroot/hurdextras/httpfs/netfs.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -r1.1.1.1 -r1.2
--- netfs.c     15 Apr 2002 19:25:42 -0000      1.1.1.1
+++ netfs.c     14 Jan 2013 10:47:05 -0000      1.2
@@ -77,16 +77,14 @@
                err = fshelp_isowner (&node->nn_stat, cred);
 
        if (!err) {
-               if (atime) {
-                       node->nn_stat.st_atime = atime->tv_sec;
-                       node->nn_stat.st_atime_usec = atime->tv_nsec / 1000;
-               } else
+               if (atime)
+                       node->nn_stat.st_atim = *atime;
+               else
                        flags |= TOUCH_ATIME;
 
-               if (mtime) {
-                       node->nn_stat.st_mtime = mtime->tv_sec;
-                       node->nn_stat.st_mtime_usec = mtime->tv_nsec / 1000;
-               } else
+               if (mtime)
+                       node->nn_stat.st_mtim = *mtime;
+               else
                        flags |= TOUCH_MTIME;
 
                fshelp_touch (&node->nn_stat, flags, httpfs_maptime);
@@ -412,7 +410,7 @@
 /* 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,
-                               off_t size)
+                               loff_t size)
 {
        return EROFS;
 }
@@ -420,7 +418,7 @@
 /* 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,
-                       struct statfs *st)
+                       fsys_statfsbuf_t *st)
 {
        return EOPNOTSUPP;
 }
@@ -464,7 +462,7 @@
    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,
-                       off_t offset, size_t *len, void *data)
+                       loff_t offset, size_t *len, void *data)
 {
        error_t err;
        static int remote_fd;
@@ -504,7 +502,7 @@
    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,
-                        off_t offset, size_t *len, void *data)
+                        loff_t offset, size_t *len, void *data)
 {
        return EROFS;
 }