diff -cr version-2.0.0/bbftpc/treatcommand.c version-2.0.0-patch02/bbftpc/treatcommand.c *** version-2.0.0/bbftpc/treatcommand.c Wed Mar 28 17:21:19 2001 --- version-2.0.0-patch02/bbftpc/treatcommand.c Tue Apr 17 22:44:01 2001 *************** *** 5,10 **** --- 5,11 ---- treatcommand.c v 2.0.0 2001/03/01 - Creation of the routine + v 2.0.1 2001/04/17 - Correct put bug *****************************************************************************/ *************** *** 386,392 **** free(dupbuffercmd) ; return -1 ; } ! if ( (localfilename = (char *) malloc (strlen(action)+1)) == NULL ) { printmessage(stderr,CASE_ERROR,35,timestamp,"Error allocating memory for %s : %s\n","localfilename",strerror(errno)) ; myexitcode = 35 ; free(dupbuffercmd) ; --- 387,393 ---- free(dupbuffercmd) ; return -1 ; } ! if ( (localfilename = (char *) malloc (strlen(startfn)+1)) == NULL ) { printmessage(stderr,CASE_ERROR,35,timestamp,"Error allocating memory for %s : %s\n","localfilename",strerror(errno)) ; myexitcode = 35 ; free(dupbuffercmd) ; *************** *** 505,511 **** free(dupbuffercmd) ; return -1 ; } ! if ( (remotefilename = (char *) malloc (strlen(action)+1)) == NULL ) { printmessage(stderr,CASE_ERROR,35,timestamp,"Error allocating memory for %s : %s\n","localfilename",strerror(errno)) ; myexitcode = 35 ; free(dupbuffercmd) ; --- 506,512 ---- free(dupbuffercmd) ; return -1 ; } ! if ( (remotefilename = (char *) malloc (strlen(startfn)+1)) == NULL ) { printmessage(stderr,CASE_ERROR,35,timestamp,"Error allocating memory for %s : %s\n","localfilename",strerror(errno)) ; myexitcode = 35 ; free(dupbuffercmd) ; *************** *** 612,632 **** /* ** two names */ ! if ( (remotefilename = (char *) malloc (strlen(action)+1)) == NULL ) { printmessage(stderr,CASE_ERROR,35,timestamp,"Error allocating memory for %s : %s\n","remotefilename",strerror(errno)) ; myexitcode = 35 ; free(dupbuffercmd) ; - free(remotefilename) ; return -1 ; } ! if ( (curfilename = (char *) malloc (strlen(startfn)+1) ) == NULL ) { printmessage(stderr,CASE_ERROR,35,timestamp,"Error allocating memory for %s : %s\n","curfilename",strerror(errno)) ; myexitcode = 35 ; free(dupbuffercmd) ; free(remotefilename) ; return -1 ; } ! if ( (realfilename = (char *) malloc (strlen(startfn)+11)) == NULL ) { printmessage(stderr,CASE_ERROR,35,timestamp,"Error allocating memory for %s : %s\n","realfilename",strerror(errno)) ; myexitcode = 35 ; free(dupbuffercmd) ; --- 613,632 ---- /* ** two names */ ! if ( (remotefilename = (char *) malloc (strlen(startfn)+1)) == NULL ) { printmessage(stderr,CASE_ERROR,35,timestamp,"Error allocating memory for %s : %s\n","remotefilename",strerror(errno)) ; myexitcode = 35 ; free(dupbuffercmd) ; return -1 ; } ! if ( (curfilename = (char *) malloc (strlen(action)+1) ) == NULL ) { printmessage(stderr,CASE_ERROR,35,timestamp,"Error allocating memory for %s : %s\n","curfilename",strerror(errno)) ; myexitcode = 35 ; free(dupbuffercmd) ; free(remotefilename) ; return -1 ; } ! if ( (realfilename = (char *) malloc (strlen(action)+11)) == NULL ) { printmessage(stderr,CASE_ERROR,35,timestamp,"Error allocating memory for %s : %s\n","realfilename",strerror(errno)) ; myexitcode = 35 ; free(dupbuffercmd) ; diff -cr version-2.0.0/bbftpd/store_rfio_v2.c version-2.0.0-patch02/bbftpd/store_rfio_v2.c *** version-2.0.0/bbftpd/store_rfio_v2.c Wed Mar 28 15:50:47 2001 --- version-2.0.0-patch02/bbftpd/store_rfio_v2.c Tue Apr 17 22:16:56 2001 *************** *** 8,14 **** int storecreatefile_rfio(char *filename, char *logmessage) int storetransferfile_rfio(char *filename, char *logmessage) ! store_rfio_v2.c v 2.0.0 2000/12/19 - Routines creation *****************************************************************************/ #include --- 8,15 ---- int storecreatefile_rfio(char *filename, char *logmessage) int storetransferfile_rfio(char *filename, char *logmessage) ! store_rfio_v2.c v 2.0.0 2000/12/19 - Routines creation ! v 2.0.1 2001/04/17 - Realy wait STARTCHILDTO *****************************************************************************/ #include *************** *** 771,782 **** ** child to die before father has started all children */ waitedtime = 0 ; ! while (flagsighup == 0 && waitedtime < 1000*STARTCHILDTO) { ! wait_timer.tv_sec = 0 ; ! wait_timer.tv_usec = 1000 ; nfds = sysconf(_SC_OPEN_MAX) ; select(nfds,0,0,0,&wait_timer) ; ! waitedtime = waitedtime + 1000 ; } syslog(LOG_ERR,"Child %d starting",getpid()) ; /* --- 772,783 ---- ** child to die before father has started all children */ waitedtime = 0 ; ! while (flagsighup == 0 && waitedtime < STARTCHILDTO) { ! wait_timer.tv_sec = 1 ; ! wait_timer.tv_usec = 0 ; nfds = sysconf(_SC_OPEN_MAX) ; select(nfds,0,0,0,&wait_timer) ; ! waitedtime = waitedtime + 1 ; } syslog(LOG_ERR,"Child %d starting",getpid()) ; /* diff -cr version-2.0.0/bbftpd/store_v2.c version-2.0.0-patch02/bbftpd/store_v2.c *** version-2.0.0/bbftpd/store_v2.c Wed Mar 28 11:13:39 2001 --- version-2.0.0-patch02/bbftpd/store_v2.c Tue Apr 17 22:16:56 2001 *************** *** 9,15 **** int storemkdir(char *dirname,char *logmessage,int recursif) int storetransferfile(char *filename,char *logmessage) ! store_v2.c v 2.0.0 2000/12/19 - Routines creation *****************************************************************************/ #include --- 9,16 ---- int storemkdir(char *dirname,char *logmessage,int recursif) int storetransferfile(char *filename,char *logmessage) ! store_v2.c v 2.0.0 2000/12/19 - Routines creation ! v 2.0.1 2001/04/17 - Realy wait STARTCHILDTO *****************************************************************************/ #include *************** *** 825,836 **** ** child to die before father has started all children */ waitedtime = 0 ; ! while (flagsighup == 0 && waitedtime < 1000*STARTCHILDTO) { ! wait_timer.tv_sec = 0 ; ! wait_timer.tv_usec = 1000 ; nfds = sysconf(_SC_OPEN_MAX) ; select(nfds,0,0,0,&wait_timer) ; ! waitedtime = waitedtime + 1000 ; } syslog(LOG_ERR,"Child %d starting",getpid()) ; /* --- 826,837 ---- ** child to die before father has started all children */ waitedtime = 0 ; ! while (flagsighup == 0 && waitedtime < STARTCHILDTO) { ! wait_timer.tv_sec = 1 ; ! wait_timer.tv_usec = 0 ; nfds = sysconf(_SC_OPEN_MAX) ; select(nfds,0,0,0,&wait_timer) ; ! waitedtime = waitedtime + 1 ; } syslog(LOG_ERR,"Child %d starting",getpid()) ; /* diff -cr version-2.0.0/includes/version.h version-2.0.0-patch02/includes/version.h *** version-2.0.0/includes/version.h Thu Apr 5 15:23:54 2001 --- version-2.0.0-patch02/includes/version.h Tue Apr 17 22:20:55 2001 *************** *** 9,13 **** *****************************************************************************/ ! #define VERSION "2.0.0" #define PROTOCOLVERSION 2 --- 9,13 ---- *****************************************************************************/ ! #define VERSION "2.0.0-patch02" #define PROTOCOLVERSION 2