Hello community,
here is the log from the commit of package curlftpfs
checked in at Tue Oct 3 17:38:40 CEST 2006.
--------
--- curlftpfs/curlftpfs.changes 2006-05-29 00:20:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/curlftpfs/curlftpfs.changes 2006-10-02 22:40:23.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Oct 2 22:40:02 CEST 2006 - cthiel@suse.de
+
+- update to 0.9
+ * enable utf8 support
+ * enable chmod and chown
+
+-------------------------------------------------------------------
Old:
----
curlftpfs-0.8.tar.bz2
New:
----
curlftpfs-0.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ curlftpfs.spec ++++++
--- /var/tmp/diff_new_pack.0zBtfa/_old 2006-10-03 17:37:13.000000000 +0200
+++ /var/tmp/diff_new_pack.0zBtfa/_new 2006-10-03 17:37:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package curlftpfs (Version 0.8)
+# spec file for package curlftpfs (Version 0.9)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,8 +11,8 @@
# norootforbuild
Name: curlftpfs
-Version: 0.8
-Release: 2
+Version: 0.9
+Release: 1
Summary: CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE and libcurl
License: GPL
URL: http://curlftpfs.sourceforge.net/
@@ -34,7 +34,7 @@
Robson Braga Araujo
%prep
-%setup
+%setup -q
%build
autoreconf -fi
@@ -53,6 +53,10 @@
%{_mandir}/*/%{name}.*
%changelog -n curlftpfs
+* Mon Oct 02 2006 - cthiel@suse.de
+- update to 0.9
+ * enable utf8 support
+ * enable chmod and chown
* Mon May 29 2006 - cthiel@suse.de
- removed bogus curlftpfs-0.8.patch
* Thu May 25 2006 - cthiel@suse.de
++++++ curlftpfs-0.8.tar.bz2 -> curlftpfs-0.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.8/ChangeLog new/curlftpfs-0.9/ChangeLog
--- old/curlftpfs-0.8/ChangeLog 2006-02-23 20:11:57.000000000 +0100
+++ new/curlftpfs-0.9/ChangeLog 2006-10-02 16:41:15.000000000 +0200
@@ -0,0 +1,229 @@
+2006-10-02 11:37 braga
+
+ * configure.ac: Version 0.9.
+
+2006-10-02 11:36 braga
+
+ * ftpfs.h: Better debug output.
+
+2006-09-29 15:58 braga
+
+ * tests/ftpfs-ls_unittest.c: Fix warning in test compilation.
+
+2006-09-29 15:47 braga
+
+ * ftpfs-ls.c, ftpfs.c: Some style fixes to keep all lines < 80
+ characters.
+
+2006-09-29 15:37 braga
+
+ * ftpfs-ls.c: Fix bug 1564785: Doesn't compile if fuse >
+ 2.6.0_pre2.
+
+2006-09-27 02:34 braga
+
+ * ftpfs.c: Patch by linuxfun (linuxfun at users.sourceforge.net) to
+ enable chmod and chown.
+
+2006-06-06 13:57 braga
+
+ * ftpfs.c, ftpfs.h, doc/curlftpfs.1: Patch by Jui-Nan Lin to enable
+ utf8 support.
+
+2006-05-25 03:29 braga
+
+ * configure.ac: Version 0.8.
+
+2006-05-21 16:37 braga
+
+ * ftpfs.c: Use "LIST -a" to show dotfiles.
+
+2006-05-20 15:35 braga
+
+ * ftpfs.c: Better error handling for getdir and read.
+
+2006-05-20 15:09 braga
+
+ * ftpfs-ls.c, ftpfs-ls.h, ftpfs.h, tests/ftpfs-ls_unittest.c: Added
+ copyright information to files.
+
+2006-05-20 04:40 braga
+
+ * ftpfs.c: Do not let the buffer grow indefinitely for read-only
+ files. Reset range. We only need to read one byte to know that
+ the open succeeded.
+
+2006-05-16 01:53 braga
+
+ * ftpfs.c: Fix the bug where we could perform on a dead connection.
+
+2006-05-14 23:40 braga
+
+ * ftpfs-ls.c, ftpfs.c: Fix memory leaks.
+
+2006-04-30 21:22 braga
+
+ * configure.ac, ftpfs.c, ftpfs.h: Add initial support for doing
+ read on demand from FTP servers. This makes us depend on very
+ recent libcurl versions.
+
+2006-04-27 22:36 braga
+
+ * ftpfs-ls.c, tests/ftpfs-ls_unittest.c: Correct bug with file
+ times. Reported by Andreas Jackisch.
+
+2006-04-26 14:29 braga
+
+ * ftpfs.c, ftpfs.h, doc/curlftpfs.1: Added no_verify_peer option to
+ disable the verification of SSL certificates.
+
+2006-04-24 22:11 braga
+
+ * ftpfs.c: Fix Bug #1475625. Patch submitted by Victor Chen.
+
+2006-04-13 18:31 braga
+
+ * doc/curlftpfs.1: Correct manpage identation.
+
+2006-04-13 18:10 braga
+
+ * configure.ac: Version 0.7.
+
+2006-04-13 17:35 braga
+
+ * doc/curlftpfs.1: Correct spelling errors.
+
+2006-04-13 17:16 braga
+
+ * Makefile.am, configure.ac, ftpfs.c, doc/Makefile.am,
+ doc/curlftpfs.1: Add manpage documentation.
+
+2006-04-12 23:54 braga
+
+ * ftpfs.c, ftpfs.h: Add mutex guard for filesystem operations.
+
+2006-04-12 15:52 braga
+
+ * ftpfs.c: Automatically append the ftp:// prefix if not passed in
+ the host.
+
+2006-04-12 15:50 braga
+
+ * ftpfs-ls.c: Make root dir have at least one link. Otherwise samba
+ did not see it correctly.
+
+2006-04-10 19:31 braga
+
+ * ftpfs.c: SKIP_PASV_IP is not defined in older version of libcurl.
+
+2006-04-10 19:23 braga
+
+ * configure.ac: Version 0.6.
+
+2006-04-10 19:22 braga
+
+ * ftpfs.c, ftpfs.h: Added options for doing active ftp.
+
+2006-04-10 17:15 braga
+
+ * ftpfs-ls.c: Corrected compiler warnings.
+
+2006-04-04 22:36 braga
+
+ * Makefile.am, cache.h, configure.ac, ftpfs-ls.c, ftpfs-ls.h,
+ ftpfs.c, ftpfs.h, tests/Makefile.am, tests/ftpfs-ls_unittest.c,
+ tests/run_tests.sh: Separated ftp listing parser module. It now
+ supports Windows NT listings. Added unittests for the listing
+ parser module.
+
+2006-03-23 09:07 braga
+
+ * configure.ac: Version 0.5.
+
+2006-03-23 08:54 braga
+
+ * ftpfs.c: Removed SSLv2 option because it's insecure. Added
+ options to choose SSL level and a warning to old libcurl versions
+ that try to connect even to hosts that don't support SSL.
+ Corrected cacert description. Added option to not verify the host
+ with SSL. Changed libcurl version checking to runtime. Set blocks
+ and blocksize in getattr to make the du program work. Thanks a
+ lot to Nikos Mavrogiannopoulos to all the help with SSL.
+
+2006-03-18 23:07 braga
+
+ * configure.ac: Version 0.4.
+
+2006-03-18 23:06 braga
+
+ * ftpfs.c: Added NOBODY to save some listings in rmdir, mkdir,
+ unlink and rename. Added lots of libcurl options. This makes us
+ support SSL and proxies, among lots of other things.
+
+2006-03-15 19:50 braga
+
+ * ftpfs.c: Corrected ftpfs_rename, ftpfs_mkdir, ftpfs_rmdir and
+ ftpfs_unlink when we mount a subdirectory instead of the FTP
+ root.
+
+2006-03-15 19:44 braga
+
+ * acinclude.m4: Adds libcurl M4 macro because some dummy redhats
+ don't install it even with devel package.
+
+2006-03-15 10:46 braga
+
+ * configure.ac: Version 0.3.
+
+2006-03-13 19:38 braga
+
+ * configure.ac: Better handling of dependencies.
+
+2006-03-13 16:12 braga
+
+ * ftpfs.c: Corrected problem when FTP server returned a "total"
+ line before the files themselves. Added option to not use EPSV.
+
+2006-03-11 18:31 braga
+
+ * compat/Makefile.am: [no log message]
+
+2006-03-11 18:25 braga
+
+ * Makefile.am, configure.ac: Changed autotools to use libtool
+ because it doesn't support files in subdirectories.
+
+2006-03-11 16:03 braga
+
+ * configure.ac: Version 0.2.
+
+2006-03-11 16:02 braga
+
+ * ftpfs.c: Added usage information. Abort earlier if parameters
+ incorrect.
+
+2006-03-11 16:00 braga
+
+ * README: Added some documentation to README.
+
+2006-03-10 23:33 braga
+
+ * ftpfs.c: Corrected file listing parser to work with files with
+ spaces in the name.
+
+2006-02-23 16:23 braga
+
+ * configure.ac: Correcting package name and version.
+
+2006-02-23 16:11 braga
+
+ * INSTALL, Makefile.am, cache.c, cache.h, configure.ac, ftpfs.c,
+ AUTHORS, COPYING, ChangeLog, NEWS, README, compat/fuse_opt.c,
+ compat/fuse_opt.h: Initial release.
+
+2006-02-23 16:11 braga
+
+ * INSTALL, Makefile.am, cache.c, cache.h, configure.ac, ftpfs.c,
+ AUTHORS, COPYING, ChangeLog, NEWS, README, compat/fuse_opt.c,
+ compat/fuse_opt.h: Initial revision
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.8/configure new/curlftpfs-0.9/configure
--- old/curlftpfs-0.8/configure 2006-05-21 21:49:50.000000000 +0200
+++ new/curlftpfs-0.9/configure 2006-10-02 16:38:11.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for curlftpfs 0.8.
+# Generated by GNU Autoconf 2.59 for curlftpfs 0.9.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -421,8 +421,8 @@
# Identity of this package.
PACKAGE_NAME='curlftpfs'
PACKAGE_TARNAME='curlftpfs'
-PACKAGE_VERSION='0.8'
-PACKAGE_STRING='curlftpfs 0.8'
+PACKAGE_VERSION='0.9'
+PACKAGE_STRING='curlftpfs 0.9'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -971,7 +971,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures curlftpfs 0.8 to adapt to many kinds of systems.
+\`configure' configures curlftpfs 0.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1037,7 +1037,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of curlftpfs 0.8:";;
+ short | recursive ) echo "Configuration of curlftpfs 0.9:";;
esac
cat <<\_ACEOF
@@ -1181,7 +1181,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-curlftpfs configure 0.8
+curlftpfs configure 0.9
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1195,7 +1195,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by curlftpfs $as_me 0.8, which was
+It was created by curlftpfs $as_me 0.9, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1838,7 +1838,7 @@
# Define the identity of the package.
PACKAGE='curlftpfs'
- VERSION='0.8'
+ VERSION='0.9'
cat >>confdefs.h <<_ACEOF
@@ -20043,7 +20043,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by curlftpfs $as_me 0.8, which was
+This file was extended by curlftpfs $as_me 0.9, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20106,7 +20106,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-curlftpfs config.status 0.8
+curlftpfs config.status 0.9
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.8/configure.ac new/curlftpfs-0.9/configure.ac
--- old/curlftpfs-0.8/configure.ac 2006-05-21 21:45:47.000000000 +0200
+++ new/curlftpfs-0.9/configure.ac 2006-10-02 16:36:40.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT(curlftpfs, 0.8)
+AC_INIT(curlftpfs, 0.9)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.8/doc/curlftpfs.1 new/curlftpfs-0.9/doc/curlftpfs.1
--- old/curlftpfs-0.8/doc/curlftpfs.1 2006-04-26 19:29:28.000000000 +0200
+++ new/curlftpfs-0.9/doc/curlftpfs.1 2006-09-27 03:28:40.000000000 +0200
@@ -253,6 +253,10 @@
.B user=user:password
Specify user and password to use for server authentication. Overrides
netrc configuration.
+.TP
+.B utf8
+Try to transfer file list with UTF-8 encoding. Send OPTS UTF8 ON at the
+beginning of file list transfer.
.SH FUSE OPTIONS
.TP
.B "-d"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.8/ftpfs-ls.c new/curlftpfs-0.9/ftpfs-ls.c
--- old/curlftpfs-0.8/ftpfs-ls.c 2006-05-20 19:49:18.000000000 +0200
+++ new/curlftpfs-0.9/ftpfs-ls.c 2006-10-02 15:32:42.000000000 +0200
@@ -6,7 +6,7 @@
See the file COPYING.
*/
-#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600
#include
#include
#include
@@ -40,15 +40,34 @@
memset(&tm, 0, sizeof(tm));
memset(&tt, 0, sizeof(tt));
- res = sscanf(line, "%11s%*[ \t]%lu%*[ \t]%32s%*[ \t]%32s%*[ \t]%lu%*[ \t]%3s%*[ \t]%2s%*[ \t]%5s%*[ \t]%1023c",
+#define SPACES "%*[ \t]"
+ res = sscanf(line,
+ "%11s" SPACES
+ "%lu" SPACES
+ "%32s" SPACES
+ "%32s" SPACES
+ "%lu" SPACES
+ "%3s" SPACES
+ "%2s" SPACES
+ "%5s" SPACES
+ "%1023c",
mode, &nlink, user, group, &size, month, day, year, file);
if (res < 9) {
- res = sscanf(line, "%11s%*[ \t]%32s%*[ \t]%32s%*[ \t]%lu%*[ \t]%3s%*[ \t]%2s%*[ \t]%5s%*[ \t]%1023c",
+ res = sscanf(line,
+ "%11s" SPACES
+ "%32s" SPACES
+ "%32s" SPACES
+ "%lu" SPACES
+ "%3s" SPACES
+ "%2s" SPACES
+ "%5s" SPACES
+ "%1023c",
mode, user, group, &size, month, day, year, file);
if (res < 8) {
return 0;
}
}
+#undef SPACES
char *link_marker = strstr(file, " -> ");
if (link_marker) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.8/ftpfs.c new/curlftpfs-0.9/ftpfs.c
--- old/curlftpfs-0.8/ftpfs.c 2006-05-21 21:38:18.000000000 +0200
+++ new/curlftpfs-0.9/ftpfs.c 2006-09-29 20:40:09.000000000 +0200
@@ -260,6 +260,7 @@
FTPFS_OPT("sslv3", ssl_version, CURL_SSLVERSION_SSLv3),
FTPFS_OPT("ipv4", ip_version, CURL_IPRESOLVE_V4),
FTPFS_OPT("ipv6", ip_version, CURL_IPRESOLVE_V6),
+ FTPFS_OPT("utf8", tryutf8, 1),
FUSE_OPT_KEY("-h", KEY_HELP),
FUSE_OPT_KEY("--help", KEY_HELP),
@@ -322,7 +323,8 @@
err = -EIO;
} else {
buf_add_mem(&buf, "\0", 1);
- parse_dir(buf.p, dir_path + strlen(ftpfs.host) - 1, NULL, NULL, NULL, 0, h, filler);
+ parse_dir(buf.p, dir_path + strlen(ftpfs.host) - 1,
+ NULL, NULL, NULL, 0, h, filler);
}
free(dir_path);
@@ -372,7 +374,8 @@
char* name = strrchr(path, '/');
++name;
- err = parse_dir(buf.p, dir_path + strlen(ftpfs.host) - 1, name, sbuf, NULL, 0, NULL, NULL);
+ err = parse_dir(buf.p, dir_path + strlen(ftpfs.host) - 1,
+ name, sbuf, NULL, 0, NULL, NULL);
free(dir_path);
buf_free(&buf);
@@ -604,16 +607,77 @@
}
static int ftpfs_chmod(const char* path, mode_t mode) {
- (void) path;
- (void) mode;
- return 0;
+ int err = 0;
+
+ // We can only process a subset of the mode - so strip
+ // to supported subset
+ int mode_c = mode - (mode / 0x1000 * 0x1000);
+
+ struct curl_slist* header = NULL;
+ char* full_path = get_dir_path(path, 1);
+ char* cmd = g_strdup_printf("SITE CHMOD %.3o %s",
+ mode_c, strrchr(path, '/') + 1);
+ struct buffer buf;
+ buf_init(&buf, 0);
+
+ header = curl_slist_append(header, cmd);
+
+ pthread_mutex_lock(&ftpfs.lock);
+ curl_multi_remove_handle(ftpfs.multi, ftpfs.connection);
+ curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, header);
+ curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path);
+ curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf);
+ curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_NOBODY, ftpfs.safe_nobody);
+ CURLcode curl_res = curl_easy_perform(ftpfs.connection);
+ curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, NULL);
+ curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_NOBODY, 0);
+ pthread_mutex_unlock(&ftpfs.lock);
+
+ if (curl_res != 0) {
+ err = -EPERM;
+ }
+
+ buf_free(&buf);
+ curl_slist_free_all(header);
+ free(full_path);
+ free(cmd);
+ return err;
}
static int ftpfs_chown(const char* path, uid_t uid, gid_t gid) {
- (void) path;
- (void) uid;
- (void) gid;
- return 0;
+ int err = 0;
+
+ struct curl_slist* header = NULL;
+ char* full_path = get_dir_path(path, 1);
+ char* cmd = g_strdup_printf("SITE CHUID %i %s", uid, strrchr(path, '/') + 1);
+ char* cmd2 = g_strdup_printf("SITE CHGID %i %s", gid, strrchr(path, '/') + 1);
+ struct buffer buf;
+ buf_init(&buf, 0);
+
+ header = curl_slist_append(header, cmd);
+ header = curl_slist_append(header, cmd2);
+
+ pthread_mutex_lock(&ftpfs.lock);
+ curl_multi_remove_handle(ftpfs.multi, ftpfs.connection);
+ curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, header);
+ curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path);
+ curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf);
+ curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_NOBODY, ftpfs.safe_nobody);
+ CURLcode curl_res = curl_easy_perform(ftpfs.connection);
+ curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, NULL);
+ curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_NOBODY, 0);
+ pthread_mutex_unlock(&ftpfs.lock);
+
+ if (curl_res != 0) {
+ err = -EPERM;
+ }
+
+ buf_free(&buf);
+ curl_slist_free_all(header);
+ free(full_path);
+ free(cmd);
+ free(cmd2);
+ return err;
}
static int ftpfs_truncate(const char* path, off_t offset) {
@@ -849,7 +913,8 @@
char* name = strrchr(path, '/');
++name;
- err = parse_dir(buf.p, dir_path + strlen(ftpfs.host) - 1, name, NULL, linkbuf, size, NULL, NULL);
+ err = parse_dir(buf.p, dir_path + strlen(ftpfs.host) - 1,
+ name, NULL, linkbuf, size, NULL, NULL);
free(dir_path);
buf_free(&buf);
@@ -1008,6 +1073,7 @@
" sslv3 use SSLv3 (SSL)\n"
" ipv4 resolve name to IPv4 address\n"
" ipv6 resolve name to IPv6 address\n"
+" utf8 try to transfer file list with utf-8 encoding\n"
"\n", progname);
}
@@ -1020,6 +1086,19 @@
curl_easy_setopt_or_die(easy, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt_or_die(easy, CURLOPT_CUSTOMREQUEST, "LIST -a");
+ if (ftpfs.tryutf8) {
+ // We'll let the slist leak, as it will still be accessible within
+ // libcurl. If we ever want to add more commands to CURLOPT_QUOTE, we'll
+ // have to think of a better strategy.
+ struct curl_slist *slist = NULL;
+
+ // Adding the QUOTE here will make this command be sent with every request.
+ // This is necessary to ensure that the server is still in UTF8 mode after
+ // we get disconnected and automatically reconnect.
+ slist = curl_slist_append(slist, "OPTS UTF8 ON");
+ curl_easy_setopt_or_die(easy, CURLOPT_QUOTE, slist);
+ }
+
if (ftpfs.verbose) {
curl_easy_setopt_or_die(easy, CURLOPT_VERBOSE, TRUE);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.8/ftpfs.h new/curlftpfs-0.9/ftpfs.h
--- old/curlftpfs-0.8/ftpfs.h 2006-05-20 19:59:57.000000000 +0200
+++ new/curlftpfs-0.9/ftpfs.h 2006-10-02 15:31:54.000000000 +0200
@@ -61,11 +61,17 @@
size_t symlink_prefix_len;
curl_version_info_data* curl_version;
int safe_nobody;
+ int tryutf8;
};
extern struct ftpfs ftpfs;
#define DEBUG(args...) \
- do { if (ftpfs.debug) fprintf(stderr, args); } while(0)
+ do { if (ftpfs.debug) {\
+ fprintf(stderr, "%ld ", time(NULL));\
+ fprintf(stderr, __FILE__ ":%d ", __LINE__);\
+ fprintf(stderr, args);\
+ }\
+ } while(0)
#endif /* __CURLFTPFS_FTPFS_H__ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/curlftpfs-0.8/tests/ftpfs-ls_unittest.c new/curlftpfs-0.9/tests/ftpfs-ls_unittest.c
--- old/curlftpfs-0.8/tests/ftpfs-ls_unittest.c 2006-05-20 19:49:54.000000000 +0200
+++ new/curlftpfs-0.9/tests/ftpfs-ls_unittest.c 2006-10-02 16:33:40.000000000 +0200
@@ -6,14 +6,15 @@
See the file COPYING.
*/
-#include "ftpfs.h"
-#include "ftpfs-ls.h"
+#define _XOPEN_SOURCE 600 /* glibc2 needs this */
+#include
#include
#include
#include
#include
-#define _XOPEN_SOURCE /* glibc2 needs this */
-#include
+
+#include "ftpfs.h"
+#include "ftpfs-ls.h"
struct ftpfs ftpfs;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
