radmind-commit Mailing List for Radmind (Page 22)

Brought to you by: fitterhappier, shannahs, umeditor, uurazzle, wescraig

radmind-commit — CVS commit messages.

You can subscribe to this list here.

2006	Jan	Feb (52)	Mar (83)	Apr (37)	May (23)	Jun (9)	Jul (10)	Aug (30)	Sep (4)	Oct (9)	Nov (10)	Dec (7)
2007	Jan (3)	Feb (20)	Mar (3)	Apr	May (10)	Jun (17)	Jul (11)	Aug (6)	Sep (6)	Oct	Nov (15)	Dec (15)
2008	Jan (12)	Feb (1)	Mar (13)	Apr (7)	May (4)	Jun (37)	Jul (9)	Aug (7)	Sep	Oct	Nov	Dec (1)
2009	Jan (1)	Feb (11)	Mar	Apr	May	Jun	Jul	Aug (2)	Sep	Oct (1)	Nov	Dec
2010	Jan (3)	Feb (1)	Mar	Apr	May (2)	Jun (2)	Jul (1)	Aug	Sep	Oct (4)	Nov (6)	Dec (2)
2011	Jan (1)	Feb (1)	Mar	Apr	May	Jun (4)	Jul	Aug	Sep (3)	Oct (3)	Nov (6)	Dec
2012	Jan	Feb	Mar	Apr (1)	May (2)	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2014	Jan (3)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 20 21 22 (Page 22 of 22)

[Radmind-commit] radmind aclocal.m4,1.13,1.13.2.1 configure,1.45,1.45.2.1

From: Patrick M. <ume...@us...> - 2006-02-21 21:30:08

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16586

Modified Files:
      Tag: radmind-1-6-0-branch
	aclocal.m4 configure 
Log Message:
Pass correct configure args to libsnet for ssl and sasl ( bugs 1435999 )
Thanks Matt Selsky


Index: aclocal.m4
===================================================================
RCS file: /cvsroot/radmind/radmind/aclocal.m4,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** aclocal.m4	24 Jan 2006 20:47:52 -0000	1.13
--- aclocal.m4	21 Feb 2006 21:29:59 -0000	1.13.2.1
***************
*** 74,78 ****
  			CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
  			LDFLAGS="$LDFLAGS -L$zlibdir/lib";
!  	   		ac_configure_extra_args="$ac_configure_extra_args --with-zlib=$dir";
  	    fi
  		LIBS="$LIBS -lz";
--- 74,78 ----
  			CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
  			LDFLAGS="$LDFLAGS -L$zlibdir/lib";
!  	   		ac_configure_args="$ac_configure_args --with-zlib=$dir";
  	    fi
  		LIBS="$LIBS -lz";
***************
*** 83,87 ****
  	fi
      else
!  	   ac_configure_extra_args="$ac_configure_extra_args --with-zlib=no";
  		AC_MSG_RESULT(no)
      fi
--- 83,87 ----
  	fi
      else
!  	   ac_configure_args="$ac_configure_args --with-zlib=no";
  		AC_MSG_RESULT(no)
      fi
***************
*** 113,117 ****
  AC_DEFUN([SET_NO_SASL],
  [
!     ac_configure_args="$ac_configure_extra_args --with-sasl=no";
      AC_MSG_RESULT(Disabled SASL)
  ])
--- 113,117 ----
  AC_DEFUN([SET_NO_SASL],
  [
!     ac_configure_args="$ac_configure_args --with-sasl=no";
      AC_MSG_RESULT(Disabled SASL)
  ])

Index: configure
===================================================================
RCS file: /cvsroot/radmind/radmind/configure,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -C2 -d -r1.45 -r1.45.2.1
*** configure	24 Jan 2006 20:47:52 -0000	1.45
--- configure	21 Feb 2006 21:29:59 -0000	1.45.2.1
***************
*** 5044,5048 ****
  			CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
  			LDFLAGS="$LDFLAGS -L$zlibdir/lib";
!  	   		ac_configure_extra_args="$ac_configure_extra_args --with-zlib=$dir";
  	    fi
  		LIBS="$LIBS -lz";
--- 5044,5048 ----
  			CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
  			LDFLAGS="$LDFLAGS -L$zlibdir/lib";
!  	   		ac_configure_args="$ac_configure_args --with-zlib=$dir";
  	    fi
  		LIBS="$LIBS -lz";
***************
*** 5058,5062 ****
  	fi
      else
!  	   ac_configure_extra_args="$ac_configure_extra_args --with-zlib=no";
  		echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
--- 5058,5062 ----
  	fi
      else
!  	   ac_configure_args="$ac_configure_args --with-zlib=no";
  		echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
***************
*** 5102,5106 ****
  
  
!     ac_configure_args="$ac_configure_extra_args --with-sasl=no";
      echo "$as_me:$LINENO: result: Disabled SASL" >&5
  echo "${ECHO_T}Disabled SASL" >&6
--- 5102,5106 ----
  
  
!     ac_configure_args="$ac_configure_args --with-sasl=no";
      echo "$as_me:$LINENO: result: Disabled SASL" >&5
  echo "${ECHO_T}Disabled SASL" >&6

[Radmind-commit] radmind command.c,1.127,1.127.2.1 config.h.in,1.6,1.6.2.1 retr.c,1.53,1.53.2.1

From: Patrick M. <ume...@us...> - 2006-02-21 21:23:11

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14176

Modified Files:
      Tag: radmind-1-6-0-branch
	command.c config.h.in retr.c 
Log Message:
Moved MIN and MAX defs into config.h.in for Solaris 9 compatibility.


Index: config.h.in
===================================================================
RCS file: /cvsroot/radmind/radmind/config.h.in,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** config.h.in	24 Jan 2006 20:47:52 -0000	1.6
--- config.h.in	21 Feb 2006 21:23:03 -0000	1.6.2.1
***************
*** 27,28 ****
--- 27,33 ----
  
  #undef HAVE_ZLIB
+ 
+ #ifdef sun
+ #define MIN(a,b)        ((a)<(b)?(a):(b))
+ #define MAX(a,b)        ((a)>(b)?(a):(b))
+ #endif /* sun */

Index: retr.c
===================================================================
RCS file: /cvsroot/radmind/radmind/retr.c,v
retrieving revision 1.53
retrieving revision 1.53.2.1
diff -C2 -d -r1.53 -r1.53.2.1
*** retr.c	24 Jan 2006 20:44:31 -0000	1.53
--- retr.c	21 Feb 2006 21:23:03 -0000	1.53.2.1
***************
*** 40,47 ****
  #include "progress.h"
  
- #ifdef sun
- #define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
- #endif /* sun */
- 
  extern void            (*logger)( char * );
  extern struct timeval  	timeout;
--- 40,43 ----

Index: command.c
===================================================================
RCS file: /cvsroot/radmind/radmind/command.c,v
retrieving revision 1.127
retrieving revision 1.127.2.1
diff -C2 -d -r1.127 -r1.127.2.1
*** command.c	6 Feb 2006 21:23:08 -0000	1.127
--- command.c	21 Feb 2006 21:23:03 -0000	1.127.2.1
***************
*** 58,66 ****
  #include "connect.h"
  
- #ifdef sun
- #define MIN(a,b)	((a)<(b)?(a):(b))
- #define MAX(a,b)	((a)>(b)?(a):(b))
- #endif /* sun */
- 
  #define	DEFAULT_MODE 0444
  #define DEFAULT_UID     0
--- 58,61 ----

[Radmind-commit] radmind daemon.c,1.74,1.74.2.1

From: Patrick M. <ume...@us...> - 2006-02-21 21:20:21

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12822

Modified Files:
      Tag: radmind-1-6-0-branch
	daemon.c 
Log Message:
Added <sys/resource.h> for portability.


Index: daemon.c
===================================================================
RCS file: /cvsroot/radmind/radmind/daemon.c,v
retrieving revision 1.74
retrieving revision 1.74.2.1
diff -C2 -d -r1.74 -r1.74.2.1
*** daemon.c	10 Feb 2006 19:31:38 -0000	1.74
--- daemon.c	21 Feb 2006 21:20:14 -0000	1.74.2.1
***************
*** 10,13 ****
--- 10,14 ----
  #include <sys/stat.h>
  #include <sys/param.h>
+ #include <sys/resource.h>
  #include <sys/wait.h>
  #include <netinet/in.h>

[Radmind-commit] CVSROOT cvsignore,NONE,1.1

From: Patrick M. <ume...@us...> - 2006-02-21 21:01:20

Update of /cvsroot/radmind/CVSROOT
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2205

Added Files:
	cvsignore 
Log Message:
Added cvsignore file that includes Makefile, autom4te.cache, config.h,
and config.log. ( PATCH 1436034 )


--- NEW FILE: cvsignore ---
Makefile
autom4te.cache
config.h
config.log
config.status

[Radmind-commit] radmind applefile.h,1.19,1.20 cksum.c,1.16,1.17 fsdiff.c,1.75,1.76 radstat.c,1.25,1.26 stor.c,1.45,1.46 transcript.c,1.113,1.114 transcript.h,1.39,1.40

From: Wes C. <wes...@us...> - 2006-02-17 20:30:14

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3644

Modified Files:
	applefile.h cksum.c fsdiff.c radstat.c stor.c transcript.c 
	transcript.h 
Log Message:
first pass at improving speed of fsdiff without checksums


Index: transcript.h
===================================================================
RCS file: /cvsroot/radmind/radmind/transcript.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** transcript.h	3 Oct 2005 15:57:13 -0000	1.39
--- transcript.h	17 Feb 2006 20:30:01 -0000	1.40
***************
*** 59,63 ****
  };
  
! int			transcript( char * );
  void			transcript_init( char *kfile, int location );
  struct transcript	*transcript_select( void );
--- 59,63 ----
  };
  
! int			transcript( char *, struct stat *, char *, struct applefileinfo * );
  void			transcript_init( char *kfile, int location );
  struct transcript	*transcript_select( void );

Index: cksum.c
===================================================================
RCS file: /cvsroot/radmind/radmind/cksum.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** cksum.c	3 Oct 2005 17:02:21 -0000	1.16
--- cksum.c	17 Feb 2006 20:30:01 -0000	1.17
***************
*** 97,101 ****
  {
      int		    	    	dfd, rfd, rc;
!     char			buf[ 8192 ];
      off_t			size = 0;
      extern struct as_header	as_header;
--- 97,101 ----
  {
      int		    	    	dfd, rfd, rc;
!     char			buf[ 8192 ], rsrc_path[ MAXPATHLEN ];
      off_t			size = 0;
      extern struct as_header	as_header;
***************
*** 122,126 ****
      /* checksum rsrc fork data */
      if ( afinfo->as_ents[ AS_RFE ].ae_length > 0 ) {
! 	if (( rfd = open( afinfo->rsrc_path, O_RDONLY )) < 0 ) {
  	    return( -1 );
  	}
--- 122,132 ----
      /* checksum rsrc fork data */
      if ( afinfo->as_ents[ AS_RFE ].ae_length > 0 ) {
!         if ( snprintf( rsrc_path, MAXPATHLEN, "%s%s",
! 		path, _PATH_RSRCFORKSPEC ) >= MAXPATHLEN ) {
!             errno = ENAMETOOLONG;
!             return( -1 );
!         }
! 
! 	if (( rfd = open( rsrc_path, O_RDONLY )) < 0 ) {
  	    return( -1 );
  	}

Index: applefile.h
===================================================================
RCS file: /cvsroot/radmind/radmind/applefile.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** applefile.h	20 Sep 2004 21:22:28 -0000	1.19
--- applefile.h	17 Feb 2006 20:30:01 -0000	1.20
***************
*** 64,70 ****
  
  struct applefileinfo {
- #ifdef __APPLE__
-     char                rsrc_path[ MAXPATHLEN ];
- #endif /* __APPLE__ */
      struct attr_info	ai;		// finder info
      struct as_entry	as_ents[ 3 ];	// Apple Single entries
--- 64,67 ----

Index: transcript.c
===================================================================
RCS file: /cvsroot/radmind/radmind/transcript.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** transcript.c	8 Oct 2005 21:32:33 -0000	1.113
--- transcript.c	17 Feb 2006 20:30:01 -0000	1.114
***************
*** 23,27 ****
  #include "argcargv.h"
  #include "code.h"
- #include "radstat.h"
  #include "cksum.h"
  #include "pathcmp.h"
--- 23,26 ----
***************
*** 611,615 ****
  
      int
! transcript( char *path )
  {
      struct pathinfo	pi;
--- 610,614 ----
  
      int
! transcript( char *path, struct stat *st, char *type, struct applefileinfo *afinfo )
  {
      struct pathinfo	pi;
***************
*** 625,647 ****
       */
      if ( path != NULL ) {
- 	switch ( radstat( path, &pi.pi_stat, &pi.pi_type,
- 		&pi.pi_afinfo )) {
- 	case 0:
- 	    break;
- 	case 1:
- 	    fprintf( stderr, "%s is of an unknown type\n", path );
- 	    exit( 2 );
- 	default:
- 	    if (( errno == ENOTDIR ) || ( errno == ENOENT )) {
- 		memset( &pi.pi_stat, 0, sizeof( struct stat ));
- 		pi.pi_type = 'X';
- 		break;
- 	    } else {
- 		perror( path );
- 		exit( 2 );
- 	    }
- 	}
- 
  	strcpy( pi.pi_name, path );
  
  	/* if it's multiply referenced, check if it's a hardlink */
--- 624,631 ----
       */
      if ( path != NULL ) {
  	strcpy( pi.pi_name, path );
+ 	pi.pi_stat = *st;
+ 	pi.pi_type = *type;
+ 	pi.pi_afinfo = *afinfo;
  
  	/* if it's multiply referenced, check if it's a hardlink */
***************
*** 936,940 ****
       * filesystem to compare against.
       */
!     transcript( NULL );
  
      while ( tran_head != NULL ) {
--- 920,924 ----
       * filesystem to compare against.
       */
!     transcript( NULL, NULL, NULL, NULL );
  
      while ( tran_head != NULL ) {

Index: radstat.c
===================================================================
RCS file: /cvsroot/radmind/radmind/radstat.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** radstat.c	9 Nov 2004 20:33:27 -0000	1.25
--- radstat.c	17 Feb 2006 20:30:01 -0000	1.26
***************
*** 38,41 ****
--- 38,45 ----
  
      if ( lstat( path, st ) != 0 ) {
+ 	if (( errno == ENOTDIR ) || ( errno == ENOENT )) {
+ 	    memset( st, 0, sizeof( struct stat ));
+ 	    *type = 'X';
+ 	}
  	return( -1 );
      }
***************
*** 103,112 ****
      /* Calculate full size of applefile */
      if ( *type == 'a' ) {
-  
-         if ( snprintf( afinfo->rsrc_path, MAXPATHLEN,
-                 "%s%s", path, _PATH_RSRCFORKSPEC ) > MAXPATHLEN - 1 ) {
-             errno = ENAMETOOLONG;
-             return( -1 );
-         }
  
  	/* Finder Info */
--- 107,110 ----

Index: fsdiff.c
===================================================================
RCS file: /cvsroot/radmind/radmind/fsdiff.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** fsdiff.c	5 Oct 2005 14:53:00 -0000	1.75
--- fsdiff.c	17 Feb 2006 20:30:01 -0000	1.76
***************
*** 6,11 ****
  #include "config.h"
  
- #include <sys/types.h>
  #include <sys/param.h>
  #include <unistd.h>
  #include <errno.h>
--- 6,12 ----
  #include "config.h"
  
  #include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
  #include <unistd.h>
  #include <errno.h>
***************
*** 13,16 ****
--- 14,18 ----
  #include <stdio.h>
  #include <string.h>
+ #include <fcntl.h>
  
  #include <openssl/evp.h>
***************
*** 18,23 ****
  #include "applefile.h"
  #include "transcript.h"
- #include "llist.h"
  #include "pathcmp.h"
  
  void            (*logger)( char * ) = NULL;
--- 20,25 ----
  #include "applefile.h"
  #include "transcript.h"
  #include "pathcmp.h"
+ #include "radstat.h"
  
  void            (*logger)( char * ) = NULL;
***************
*** 25,42 ****
  extern char	*version, *checksumlist;
  
! void		fs_walk( char *, int, int );
  int		dodots = 0;
  int		lastpercent = -1;
  int		case_sensitive = 1;
  const EVP_MD    *md;
  
      void
! fs_walk( char *path, int start, int finish ) 
  {
      DIR			*dir;
      struct dirent	*de;
!     struct llist	*head = NULL;
!     struct llist	*new;
!     struct llist	*cur;
      int			len;
      int			count = 0;
--- 27,88 ----
  extern char	*version, *checksumlist;
  
! void		fs_walk( char *, struct stat *, char *, struct applefileinfo *,
! 	int, int );
  int		dodots = 0;
+ int		dotfd;
  int		lastpercent = -1;
  int		case_sensitive = 1;
  const EVP_MD    *md;
  
+ static struct fs_list *fs_insert( struct fs_list **, struct fs_list *,
+ 	char *, int (*)( char *, char * ));
+ 
+ struct fs_list {
+     struct fs_list		*fl_next;
+     char			*fl_name;
+     struct stat			fl_stat;
+     char			fl_type;
+     struct applefileinfo	fl_afinfo;
+ };
+ 
+     static struct fs_list *
+ fs_insert( struct fs_list **head, struct fs_list *last,
+ 	char *name, int (*cmp)( char *, char * ))
+ {
+     struct fs_list	**current, *new;
+ 
+     if (( last != NULL ) && ( (*cmp)( name, last->fl_name ) > 0 )) {
+ 	current = &last->fl_next;
+     } else {
+ 	current = head;
+     }
+ 
+     /* find where in the list to put the new entry */
+     for ( ; *current != NULL; current = &(*current)->fl_next) {
+ 	if ( (*cmp)( name, (*current)->fl_name ) <= 0 ) {
+ 	    break;
+ 	}
+     }
+ 
+     if (( new = malloc( sizeof( struct fs_list ))) == NULL ) {
+ 	return( NULL );
+     }
+     if (( new->fl_name = strdup( name )) == NULL ) {
+ 	free( new );
+ 	return( NULL );
+     }
+ 
+     new->fl_next = *current;
+     *current = new; 
+     return( new ); 
+ }
+ 
      void
! fs_walk( char *path, struct stat *st, char *type, struct applefileinfo *afinfo,
! 	int start, int finish ) 
  {
      DIR			*dir;
      struct dirent	*de;
!     struct fs_list	*head = NULL, *cur, *new = NULL, *next;
      int			len;
      int			count = 0;
***************
*** 44,47 ****
--- 90,94 ----
      char		temp[ MAXPATHLEN ];
      struct transcript	*tran;
+     int			(*cmp)( char *, char * );
  
      if (( finish > 0 ) && ( start != lastpercent )) {
***************
*** 52,56 ****
  
      /* call the transcript code */
!     switch ( transcript( path )) {
      case 2 :			/* negative directory */
  	for (;;) {
--- 99,103 ----
  
      /* call the transcript code */
!     switch ( transcript( path, st, type, afinfo )) {
      case 2 :			/* negative directory */
  	for (;;) {
***************
*** 61,72 ****
  
  	    if ( ischildcase( tran->t_pinfo.pi_name, path, case_sensitive )) {
! 		/*
! 		 * XXX
! 		 * This strcpy() is not itself dangerous, because pi_name
! 		 * is a MAXPATHLEN-sized buffer.  However, it does not appear
! 		 * that copies into pi_name are carefully checked.
! 		 */
  		strcpy( temp, tran->t_pinfo.pi_name );
! 		fs_walk( temp, start, finish );
  	    } else {
  		return;
--- 108,130 ----
  
  	    if ( ischildcase( tran->t_pinfo.pi_name, path, case_sensitive )) {
! 		struct stat		st0;
! 		char			type0;
! 		struct applefileinfo	afinfo0;
! 
  		strcpy( temp, tran->t_pinfo.pi_name );
! 		switch ( radstat( temp, &st0, &type0, &afinfo0 ) < 0 ) {
! 		case 0:
! 		    break;
! 		case 1:
! 		    fprintf( stderr, "%s is of an unknown type\n", temp );
! 		    exit( 2 );
! 		default:
! 		    if (( errno != ENOTDIR ) && ( errno != ENOENT )) {
! 			perror( path );
! 			exit( 2 );
! 		    }
! 		}
! 
! 		fs_walk( temp, &st0, &type0, &afinfo0, start, finish );
  	    } else {
  		return;
***************
*** 86,91 ****
      }
  
      /* open directory */
!     if (( dir = opendir( path )) == NULL ) {
  	perror( path );
  	exit( 2 );	
--- 144,160 ----
      }
  
+     if ( case_sensitive ) {
+ 	cmp = strcmp;
+     } else {
+ 	cmp = strcasecmp;
+     }
+ 
+     if ( chdir( path ) < 0 ) {
+ 	perror( path );
+ 	exit( 2 );
+     }
+ 
      /* open directory */
!     if (( dir = opendir( "." )) == NULL ) {
  	perror( path );
  	exit( 2 );	
***************
*** 102,152 ****
  
  	count++;
- 	len = strlen( path );
  
! 	/* absolute pathname. add 2 for / and NULL termination.  */
! 	if (( len + strlen( de->d_name ) + 2 ) > MAXPATHLEN ) {
! 	    fprintf( stderr, "Absolute pathname too long\n" );
  	    exit( 2 );
  	}
  
  	if ( path[ len - 1 ] == '/' ) {
! 	    if ( snprintf( temp, MAXPATHLEN, "%s%s", path, de->d_name )
  		    >= MAXPATHLEN ) {
!                 fprintf( stderr, "%s%s: path too long\n", path, de->d_name );
  		exit( 2 );
  	    }
  	} else {
!             if ( snprintf( temp, MAXPATHLEN, "%s/%s", path, de->d_name )
  		    >= MAXPATHLEN ) {
!                 fprintf( stderr, "%s/%s: path too long\n", path, de->d_name );
                  exit( 2 );
              }
  	}
  
! 	/* allocate new node for newly created relative pathname */
! 	new = ll_allocate( temp );
! 
! 	/* insert new file into the list */
! 	if ( case_sensitive ) {
! 	    ll_insert( &head, new ); 
! 	} else {
! 	    ll_insert_case( &head, new ); 
! 	}
!     }
! 
!     chunk = (( finish - start ) / ( float )count );
! 
!     if ( closedir( dir ) != 0 ) {
! 	perror( "closedir" );
! 	exit( 2 );
!     }
  
-     /* call fswalk on each element in the sorted list */
-     for ( cur = head; cur != NULL; cur = cur->ll_next ) {
- 	fs_walk( cur->ll_name, ( int )f, ( int )( f + chunk ));
  	f += chunk;
-     }
  
!     ll_free( head );
  
      return;
--- 171,234 ----
  
  	count++;
  
! 	if (( new = fs_insert( &head, new, de->d_name, cmp )) == NULL ) {
! 	    perror( "malloc" );
! 	    exit( 1 );
! 	}
! 
! 	switch ( radstat( new->fl_name, &new->fl_stat, &new->fl_type,
! 		&new->fl_afinfo ) < 0 ) {
! 	case 0:
! 	    break;
! 	case 1:
! 	    fprintf( stderr, "%s is of an unknown type\n", path );
  	    exit( 2 );
+ 	default:
+ 	    if (( errno != ENOTDIR ) && ( errno != ENOENT )) {
+ 		perror( path );
+ 		exit( 2 );
+ 	    }
  	}
+     }
+ 
+     if ( closedir( dir ) != 0 ) {
+ 	perror( "closedir" );
+ 	exit( 2 );
+     }
  
+     if ( fchdir( dotfd ) < 0 ) {
+ 	perror( "OOPS!" );
+ 	exit( 2 );
+     }
+ 
+     chunk = (( finish - start ) / ( float )count );
+ 
+     len = strlen( path );
+ 
+     /* call fswalk on each element in the sorted list */
+     for ( cur = head; cur != NULL; cur = next ) {
  	if ( path[ len - 1 ] == '/' ) {
! 	    if ( snprintf( temp, MAXPATHLEN, "%s%s", path, cur->fl_name )
  		    >= MAXPATHLEN ) {
!                 fprintf( stderr, "%s%s: path too long\n", path, cur->fl_name );
  		exit( 2 );
  	    }
  	} else {
!             if ( snprintf( temp, MAXPATHLEN, "%s/%s", path, cur->fl_name )
  		    >= MAXPATHLEN ) {
!                 fprintf( stderr, "%s/%s: path too long\n", path, cur->fl_name );
                  exit( 2 );
              }
  	}
  
! 	fs_walk( temp, &cur->fl_stat, &cur->fl_type, &cur->fl_afinfo,
! 		(int)f, (int)( f + chunk ));
  
  	f += chunk;
  
! 	next = cur->fl_next;
! 	free( cur->fl_name );
! 	free( cur );
!     }
  
      return;
***************
*** 163,166 ****
--- 245,250 ----
      int			finish = 0;
      struct stat		st;
+     char		type;
+     struct applefileinfo	afinfo;
  
      edit_path = CREATABLE;
***************
*** 258,271 ****
      }
  
!     /* verify the path we've been given exists */
!     if ( stat( path_prefix, &st ) != 0 ) {
  	perror( path_prefix );
  	exit( 2 );
      }
  
      /* initialize the transcripts */
      transcript_init( kfile, K_CLIENT );
  
!     fs_walk( path_prefix, 0, finish );
  
      if ( finish > 0 ) {
--- 342,359 ----
      }
  
!     if ( radstat( path_prefix, &st, &type, &afinfo ) != 0 ) {
  	perror( path_prefix );
  	exit( 2 );
      }
  
+     if (( dotfd = open( ".", O_RDONLY, 0 )) < 0 ) {
+ 	perror( "OOPS!" );
+ 	exit( 2 );
+     }
+ 
      /* initialize the transcripts */
      transcript_init( kfile, K_CLIENT );
  
!     fs_walk( path_prefix, &st, &type, &afinfo, 0, finish );
  
      if ( finish > 0 ) {

Index: stor.c
===================================================================
RCS file: /cvsroot/radmind/radmind/stor.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** stor.c	24 Jan 2006 20:44:14 -0000	1.45
--- stor.c	17 Feb 2006 20:30:01 -0000	1.46
***************
*** 258,262 ****
      int			rc = 0, dfd = 0, rfd = 0;
      off_t		size;
!     char		buf[ 8192 ];
      struct timeval   	tv;
      unsigned int      	md_len;
--- 258,262 ----
      int			rc = 0, dfd = 0, rfd = 0;
      off_t		size;
!     char		buf[ 8192 ], rsrc_path[ MAXPATHLEN ];
      struct timeval   	tv;
      unsigned int      	md_len;
***************
*** 294,299 ****
      }
      if ( afinfo->as_ents[ AS_RFE ].ae_length > 0 ) {
! 	if (( rfd = open( afinfo->rsrc_path, O_RDONLY )) < 0 ) {
! 	    perror( afinfo->rsrc_path );
  	    close( dfd );
  	    exit( 2 );
--- 294,304 ----
      }
      if ( afinfo->as_ents[ AS_RFE ].ae_length > 0 ) {
!         if ( snprintf( rsrc_path, MAXPATHLEN, "%s%s",
! 		path, _PATH_RSRCFORKSPEC ) >= MAXPATHLEN ) {
!             errno = ENAMETOOLONG;
!             return( -1 );
!         }
! 	if (( rfd = open( rsrc_path, O_RDONLY )) < 0 ) {
! 	    perror( rsrc_path );
  	    close( dfd );
  	    exit( 2 );
***************
*** 445,449 ****
      if ( afinfo->as_ents[ AS_RFE ].ae_length > 0 ) {
  	if ( close( rfd ) < 0 ) {
! 	    perror( afinfo->rsrc_path );
  	    exit( 2 );
  	}
--- 450,454 ----
      if ( afinfo->as_ents[ AS_RFE ].ae_length > 0 ) {
  	if ( close( rfd ) < 0 ) {
! 	    perror( rsrc_path );
  	    exit( 2 );
  	}

[Radmind-commit] radmind command.c,1.127,1.128 config.h.in,1.6,1.7 retr.c,1.53,1.54

From: Patrick M. <ume...@us...> - 2006-02-17 17:19:41

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29264

Modified Files:
	command.c config.h.in retr.c 
Log Message:
Moved MIN and MAX defs into config.h.in for Solaris 9 compatibility.


Index: config.h.in
===================================================================
RCS file: /cvsroot/radmind/radmind/config.h.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.h.in	24 Jan 2006 20:47:52 -0000	1.6
--- config.h.in	17 Feb 2006 17:19:38 -0000	1.7
***************
*** 27,28 ****
--- 27,33 ----
  
  #undef HAVE_ZLIB
+ 
+ #ifdef sun
+ #define MIN(a,b)        ((a)<(b)?(a):(b))
+ #define MAX(a,b)        ((a)>(b)?(a):(b))
+ #endif /* sun */

Index: retr.c
===================================================================
RCS file: /cvsroot/radmind/radmind/retr.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** retr.c	24 Jan 2006 20:44:31 -0000	1.53
--- retr.c	17 Feb 2006 17:19:38 -0000	1.54
***************
*** 40,47 ****
  #include "progress.h"
  
- #ifdef sun
- #define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
- #endif /* sun */
- 
  extern void            (*logger)( char * );
  extern struct timeval  	timeout;
--- 40,43 ----

Index: command.c
===================================================================
RCS file: /cvsroot/radmind/radmind/command.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** command.c	6 Feb 2006 21:23:08 -0000	1.127
--- command.c	17 Feb 2006 17:19:38 -0000	1.128
***************
*** 58,66 ****
  #include "connect.h"
  
- #ifdef sun
- #define MIN(a,b)	((a)<(b)?(a):(b))
- #define MAX(a,b)	((a)>(b)?(a):(b))
- #endif /* sun */
- 
  #define	DEFAULT_MODE 0444
  #define DEFAULT_UID     0
--- 58,61 ----

[Radmind-commit] radmind daemon.c,1.74,1.75

From: Patrick M. <ume...@us...> - 2006-02-17 16:35:14

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6281

Modified Files:
	daemon.c 
Log Message:
Added <sys/resource.h> for portability.


Index: daemon.c
===================================================================
RCS file: /cvsroot/radmind/radmind/daemon.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** daemon.c	10 Feb 2006 19:31:38 -0000	1.74
--- daemon.c	17 Feb 2006 16:35:06 -0000	1.75
***************
*** 10,13 ****
--- 10,14 ----
  #include <sys/stat.h>
  #include <sys/param.h>
+ #include <sys/resource.h>
  #include <sys/wait.h>
  #include <netinet/in.h>

Flat | Threaded

<< < 1 .. 20 21 22 (Page 22 of 22)