diff -crN ./gnome-vfs/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/configure.in *** ./gnome-vfs/configure.in Mon Sep 8 14:02:52 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/configure.in Wed Oct 22 14:50:46 2003 *************** *** 364,372 **** dnl modules/cdemenu-desktop ! AC_MSG_CHECKING(for Solaris platform) case "$host" in *solaris*) build_cdemenu_module=yes ;; *) build_cdemenu_module=no ;; esac AC_MSG_RESULT([$build_cdemenu_module]) --- 364,373 ---- dnl modules/cdemenu-desktop ! AC_MSG_CHECKING(for CDE for Solaris/AIX) case "$host" in *solaris*) build_cdemenu_module=yes ;; + *aix*) build_cdemenu_module=yes ;; *) build_cdemenu_module=no ;; esac AC_MSG_RESULT([$build_cdemenu_module]) *************** *** 463,468 **** --- 464,470 ---- LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS" AC_SUBST(LIBGNOMEVFS_CFLAGS) AC_SUBST(LIBGNOMEVFS_LIBS) + AC_SUBST(AC_LIBOBJ) dnl ********************** diff -crN ./gnome-vfs/libgnomevfs/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/Makefile.am *** ./gnome-vfs/libgnomevfs/Makefile.am Mon May 19 11:50:19 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/Makefile.am Wed Oct 22 14:51:29 2003 *************** *** 36,41 **** --- 36,42 ---- libgnomevfs_2_la_LIBADD = \ $(LIBGNOMEVFS_LIBS) \ + $(LIBOBJS) \ $(NULL) libgnomevfs_2_la_LDFLAGS = \ diff -crN ./gnome-vfs/libgnomevfs/getdelim.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/getdelim.c *** ./gnome-vfs/libgnomevfs/getdelim.c Thu Jan 1 01:00:00 1970 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/getdelim.c Fri Jul 4 08:10:54 2003 *************** *** 0 **** --- 1,116 ---- + /* getdelim.c -- Replacement for GNU C library function getdelim + + Copyright (C) 1993, 1996 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + /* Written by Jan Brittenson, bson@gnu.ai.mit.edu. + * copy inserted in libgnomevfs from gettext to support AIX + * by Laurent.Vivier@bull.net + */ + + #if HAVE_CONFIG_H + # include + #endif + + #include + #include + + # if HAVE_STDLIB_H + # include + # else + extern char *malloc (); + extern char *realloc (); + # endif + + /* Always add at least this many bytes when extending the buffer. */ + # define MIN_CHUNK 64 + + /* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR + (and null-terminate it). *LINEPTR is a pointer returned from + malloc (or NULL), pointing to *N characters of space. It is realloc'd + as necessary. Return the number of characters read (not including the + null terminator), or -1 on error or EOF. */ + + int + getdelim (lineptr, n, terminator, stream) + char **lineptr; + size_t *n; + FILE *stream; + char terminator; + { + int nchars_avail; /* Allocated but unused chars in *LINEPTR. */ + char *read_pos; /* Where we're reading into *LINEPTR. */ + int ret; + + if (!lineptr || !n || !stream) + return -1; + + if (!*lineptr) + { + *n = MIN_CHUNK; + *lineptr = malloc (*n); + if (!*lineptr) + return -1; + } + + nchars_avail = *n; + read_pos = *lineptr; + + for (;;) + { + register int c = getc (stream); + + /* We always want at least one char left in the buffer, since we + always (unless we get an error while reading the first char) + NUL-terminate the line buffer. */ + + if (nchars_avail < 2) + { + if (*n > MIN_CHUNK) + *n *= 2; + else + *n += MIN_CHUNK; + + nchars_avail = *n + *lineptr - read_pos; + *lineptr = realloc (*lineptr, *n); + if (!*lineptr) + return -1; + read_pos = *n - nchars_avail + *lineptr; + } + + if (c == EOF || ferror (stream)) + { + /* Return partial line, if any. */ + if (read_pos == *lineptr) + return -1; + else + break; + } + + *read_pos++ = c; + nchars_avail--; + + if (c == terminator) + /* Return the line. */ + break; + } + + /* Done - NUL terminate and return the number of chars read. */ + *read_pos = '\0'; + + ret = read_pos - *lineptr; + return ret; + } diff -crN ./gnome-vfs/libgnomevfs/gnome-vfs-inet-connection.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-inet-connection.c *** ./gnome-vfs/libgnomevfs/gnome-vfs-inet-connection.c Mon Aug 25 09:10:42 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-inet-connection.c Wed Oct 22 14:52:41 2003 *************** *** 37,43 **** #include #include ! extern int h_errno; struct GnomeVFSInetConnection { #ifdef ENABLE_IPV6 --- 37,43 ---- #include #include ! /* extern int h_errno; */ struct GnomeVFSInetConnection { #ifdef ENABLE_IPV6 diff -crN ./gnome-vfs/libgnomevfs/gnome-vfs-mime-monitor.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-mime-monitor.c *** ./gnome-vfs/libgnomevfs/gnome-vfs-mime-monitor.c Tue Sep 2 13:02:01 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-mime-monitor.c Thu Oct 16 12:30:30 2003 *************** *** 34,40 **** enum { LOCAL_MIME_DIR, ! GNOME_MIME_DIR, }; static guint signals[LAST_SIGNAL]; --- 34,40 ---- enum { LOCAL_MIME_DIR, ! GNOME_MIME_DIR }; static guint signals[LAST_SIGNAL]; diff -crN ./gnome-vfs/libgnomevfs/gnome-vfs-private-utils.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-private-utils.c *** ./gnome-vfs/libgnomevfs/gnome-vfs-private-utils.c Thu Apr 24 18:25:27 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-private-utils.c Thu Oct 16 12:30:38 2003 *************** *** 288,294 **** * * Return value: **/ ! GnomeVFSProcessResult gnome_vfs_process_run_cancellable (const gchar *file_name, const gchar * const argv[], GnomeVFSProcessOptions options, --- 288,294 ---- * * Return value: **/ ! GnomeVFSProcessRunResult gnome_vfs_process_run_cancellable (const gchar *file_name, const gchar * const argv[], GnomeVFSProcessOptions options, diff -crN ./gnome-vfs/libgnomevfs/gnome-vfs-process.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-process.c *** ./gnome-vfs/libgnomevfs/gnome-vfs-process.c Mon Aug 4 18:04:24 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-process.c Thu Oct 16 12:30:46 2003 *************** *** 257,263 **** * * Return value: A numeric value reporting the result of the operation. **/ ! GnomeVFSProcessRunResult _gnome_vfs_process_signal (GnomeVFSProcess *process, guint signal_number) { --- 257,263 ---- * * Return value: A numeric value reporting the result of the operation. **/ ! GnomeVFSProcessResult _gnome_vfs_process_signal (GnomeVFSProcess *process, guint signal_number) { diff -crN ./gnome-vfs/libgnomevfs/gnome-vfs-result.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-result.c *** ./gnome-vfs/libgnomevfs/gnome-vfs-result.c Thu Apr 24 17:41:56 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-result.c Thu Oct 16 12:30:53 2003 *************** *** 29,36 **** #include #include - extern int h_errno; - static char *status_strings[] = { /* GNOME_VFS_OK */ N_("No error"), /* GNOME_VFS_ERROR_NOT_FOUND */ N_("File not found"), --- 29,34 ---- *************** *** 109,115 **** --- 107,115 ---- case EMFILE: return GNOME_VFS_ERROR_TOO_MANY_OPEN_FILES; case EMLINK: return GNOME_VFS_ERROR_TOO_MANY_LINKS; case ENFILE: return GNOME_VFS_ERROR_TOO_MANY_OPEN_FILES; + #if ENOTEMPTY != EEXIST case ENOTEMPTY: return GNOME_VFS_ERROR_DIRECTORY_NOT_EMPTY; + #endif case ENOENT: return GNOME_VFS_ERROR_NOT_FOUND; case ENOMEM: return GNOME_VFS_ERROR_NO_MEMORY; case ENOSPC: return GNOME_VFS_ERROR_NO_SPACE; diff -crN ./gnome-vfs/modules/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/Makefile.am *** ./gnome-vfs/modules/Makefile.am Thu Apr 24 18:37:36 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/Makefile.am Thu Oct 16 12:31:09 2003 *************** *** 1,4 **** - NULL = SUBDIRS = extfs vfolder INCLUDES = \ --- 1,3 ---- diff -crN ./gnome-vfs/modules/bzip2-method.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/bzip2-method.c *** ./gnome-vfs/modules/bzip2-method.c Mon May 13 00:05:21 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/bzip2-method.c Fri Jul 4 08:20:22 2003 *************** *** 549,555 **** file_info->name[namelen-4] = '\0'; /* we can't tell the size without uncompressing it */ ! //file_info->valid_fields &= ~GNOME_VFS_FILE_INFO_FIELDS_SIZE; /* guess the mime type of the file inside */ /* FIXME bugzilla.eazel.com 2791: guess mime based on contents */ --- 549,555 ---- file_info->name[namelen-4] = '\0'; /* we can't tell the size without uncompressing it */ ! /*file_info->valid_fields &= ~GNOME_VFS_FILE_INFO_FIELDS_SIZE;*/ /* guess the mime type of the file inside */ /* FIXME bugzilla.eazel.com 2791: guess mime based on contents */ diff -crN ./gnome-vfs/modules/extfs-method.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/extfs-method.c *** ./gnome-vfs/modules/extfs-method.c Mon May 19 11:50:21 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/extfs-method.c Thu Oct 16 12:31:35 2003 *************** *** 273,280 **** get_dirname (const gchar *pth) { gchar *p; ! //gchar *s; ! //guint len; gchar *path = strip_separators(pth); p = strrchr (path, G_DIR_SEPARATOR); --- 273,280 ---- get_dirname (const gchar *pth) { gchar *p; ! /*gchar *s;*/ ! /*guint len;*/ gchar *path = strip_separators(pth); p = strrchr (path, G_DIR_SEPARATOR); *************** *** 669,676 **** gchar *quoted_file_name; gchar *cmd; gchar *sub_uri; ! //const gchar *p; ! //const GList *item; GList *entries=NULL; GList *l; FILE *pipe; --- 669,676 ---- gchar *quoted_file_name; gchar *cmd; gchar *sub_uri; ! /*const gchar *p;*/ ! /*const GList *itema;*/ GList *entries=NULL; GList *l; FILE *pipe; *************** *** 789,795 **** gnome_vfs_file_info_copy (file_info, (GnomeVFSFileInfo *)item->data); ! //gnome_vfs_file_info_unref((GnomeVFSFileInfo *)item->data); *((GList **)method_handle) = item->next; --- 789,795 ---- gnome_vfs_file_info_copy (file_info, (GnomeVFSFileInfo *)item->data); ! /*gnome_vfs_file_info_unref((GnomeVFSFileInfo *)item->data);*/ *((GList **)method_handle) = item->next; diff -crN ./gnome-vfs/modules/fstype.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/fstype.c *** ./gnome-vfs/modules/fstype.c Fri Apr 11 09:48:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/fstype.c Thu Oct 16 12:31:43 2003 *************** *** 47,52 **** --- 47,54 ---- #include #include + #include + #if __STDC__ # define P_(s) s #else diff -crN ./gnome-vfs/modules/ftp-method.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/ftp-method.c *** ./gnome-vfs/modules/ftp-method.c Mon Aug 4 18:04:27 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/ftp-method.c Thu Oct 16 12:31:51 2003 *************** *** 1355,1362 **** { FtpConnection *conn; GnomeVFSResult result; ! GnomeVFSFileSize num_bytes = 1024, bytes_read; ! gchar buffer[num_bytes+1]; GString *dirlist = g_string_new (""); result = ftp_connection_acquire (uri, &conn, context); --- 1355,1362 ---- { FtpConnection *conn; GnomeVFSResult result; ! GnomeVFSFileSize bytes_read; ! gchar buffer[1025]; GString *dirlist = g_string_new (""); result = ftp_connection_acquire (uri, &conn, context); *************** *** 1396,1402 **** while (result == GNOME_VFS_OK) { result = gnome_vfs_socket_buffer_read (conn->data_socketbuf, buffer, ! num_bytes, &bytes_read); if (result == GNOME_VFS_OK && bytes_read > 0) { buffer[bytes_read] = '\0'; dirlist = g_string_append (dirlist, buffer); --- 1396,1402 ---- while (result == GNOME_VFS_OK) { result = gnome_vfs_socket_buffer_read (conn->data_socketbuf, buffer, ! 1024, &bytes_read); if (result == GNOME_VFS_OK && bytes_read > 0) { buffer[bytes_read] = '\0'; dirlist = g_string_append (dirlist, buffer); diff -crN ./gnome-vfs/modules/gzip-method.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/gzip-method.c *** ./gnome-vfs/modules/gzip-method.c Tue Jan 7 16:10:41 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/gzip-method.c Fri Jul 4 08:22:24 2003 *************** *** 733,739 **** file_info->name[namelen-3] = '\0'; /* we can't tell the size without uncompressing it */ ! //file_info->valid_fields &= ~GNOME_VFS_FILE_INFO_FIELDS_SIZE; /* guess the mime type of the file inside */ /* FIXME bugzilla.eazel.com 2791: guess mime based on contents */ --- 733,739 ---- file_info->name[namelen-3] = '\0'; /* we can't tell the size without uncompressing it */ ! /*file_info->valid_fields &= ~GNOME_VFS_FILE_INFO_FIELDS_SIZE;*/ /* guess the mime type of the file inside */ /* FIXME bugzilla.eazel.com 2791: guess mime based on contents */ diff -crN ./gnome-vfs/modules/test-method.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/test-method.c *** ./gnome-vfs/modules/test-method.c Tue Oct 23 03:07:02 2001 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/test-method.c Fri Jul 4 08:22:52 2003 *************** *** 586,592 **** if (load_settings (conf_file) == FALSE) { ! // FIXME: we probably shouldn't use printf to output the message printf (_("Didn't find a valid settings file at %s\n"), conf_file); printf (_("Use the %s environment variable to specify a different location.\n"), --- 586,592 ---- if (load_settings (conf_file) == FALSE) { ! /* FIXME: we probably shouldn't use printf to output the message */ printf (_("Didn't find a valid settings file at %s\n"), conf_file); printf (_("Use the %s environment variable to specify a different location.\n"), diff -crN ./gnome-vfs/modules/vfolder/test-vfolder.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/test-vfolder.c *** ./gnome-vfs/modules/vfolder/test-vfolder.c Fri Sep 27 17:12:59 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/test-vfolder.c Fri Jul 4 08:18:45 2003 *************** *** 466,491 **** * Move existing directory with children inside a new directory. */ ! // create dir ! // delete new dir ! // delete existing dir ! ! // create file ! // create file with keywords, check appearance in vfolders ! // edit new file ! // edit existing file ! // move new file ! // move existing file ! // set filename new file ! // set filename existing file ! // delete new file ! // delete existing file ! // monitor file creation ! // monitor file edit ! // monitor file delete ! // monitor dir creation ! // monitor dir delete return 0; } --- 466,492 ---- * Move existing directory with children inside a new directory. */ ! /* create dir ! * delete new dir ! * delete existing dir ! ! * create file ! * create file with keywords, check appearance in vfolders ! * edit new file ! * edit existing file ! * move new file ! * move existing file ! * set filename new file ! * set filename existing file ! * delete new file ! * delete existing file ! * monitor file creation ! * monitor file edit ! * monitor file delete ! * monitor dir creation ! * monitor dir delete ! */ return 0; } diff -crN ./gnome-vfs/modules/vfolder/vfolder-common.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/vfolder-common.c *** ./gnome-vfs/modules/vfolder/vfolder-common.c Thu Apr 24 18:37:36 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/vfolder-common.c Thu Oct 16 12:32:11 2003 *************** *** 249,254 **** --- 249,255 ---- } /* FIXME: Support this */ + #if 0 /* See BUGZILLA 96256 */ if (deprecates) { char **parsed = g_strsplit (keywords, ";", -1); Entry *dep; *************** *** 268,273 **** --- 269,275 ---- } g_strfreev (parsed); } + #endif g_free (keywords); g_free (deprecates); diff -crN ./gnome-vfs/modules/vfolder/vfolder-method.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/vfolder-method.c *** ./gnome-vfs/modules/vfolder/vfolder-method.c Wed Feb 12 10:53:13 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/vfolder-method.c Fri Jul 4 08:19:55 2003 *************** *** 1177,1185 **** key_idx [-1] == '\r')) { /* Look for the end of the value */ val_end = strchr (key_idx, '\n'); ! if (val_end < 0) val_end = strchr (key_idx, '\r'); ! if (val_end < 0) val_end = &fullbuf->str [fullbuf->len - 1]; /* Erase the old name */ --- 1177,1185 ---- key_idx [-1] == '\r')) { /* Look for the end of the value */ val_end = strchr (key_idx, '\n'); ! if ((int)val_end < 0) val_end = strchr (key_idx, '\r'); ! if ((int)val_end < 0) val_end = &fullbuf->str [fullbuf->len - 1]; /* Erase the old name */ diff -crN ./gnome-vfs/test/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/test/Makefile.am *** ./gnome-vfs/test/Makefile.am Mon Aug 4 18:04:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/test/Makefile.am Thu Oct 16 12:32:25 2003 *************** *** 41,46 **** --- 41,47 ---- $(NULL) test_files= \ + auto-test \ test.input \ test.cmds \ test.output *************** *** 142,150 **** test_monitor_SOURCES = test-monitor.c test_monitor_LDADD = $(libraries) - # test_metadata_SOURCES = test-metadata.c - # test_metadata_LDADD = $(libraries) - test_callback_SOURCES = test-callback.c test_callback_LDADD = $(libraries) --- 143,148 ---- *************** *** 156,160 **** EXTRA_DIST = \ $(test_files) \ - auto-test \ vfs-run.in --- 154,157 ----