faubackup/src faubackup-gather.c,1.2,1.3 faubackup-scatter.c,1.4,1.5

Update of /cvsroot/faubackup/faubackup/src
In directory sc8-pr-cvs1:/tmp/cvs-serv12052/src

Modified Files:
	faubackup-gather.c faubackup-scatter.c 
Log Message:
remove all remaining *64 calls


Index: faubackup-gather.c
===================================================================
RCS file: /cvsroot/faubackup/faubackup/src/faubackup-gather.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** faubackup-gather.c	11 Dec 2003 00:09:06 -0000	1.2
--- faubackup-gather.c	11 Dec 2003 00:52:13 -0000	1.3
***************
*** 143,149 ****
  	assert( S_ISREG(st->st_mode) );
  
! 	fd = open64( path, O_RDONLY );
  	if( fd < 0) {
! 		fprintf( stderr, "%s: open64(%s, O_RDONLY): %s\n",
  				progname, path, strerror(errno));
  		error++;
--- 143,149 ----
  	assert( S_ISREG(st->st_mode) );
  
! 	fd = open( path, O_RDONLY );
  	if( fd < 0) {
! 		fprintf( stderr, "%s: open(%s, O_RDONLY): %s\n",
  				progname, path, strerror(errno));
  		error++;

Index: faubackup-scatter.c
===================================================================
RCS file: /cvsroot/faubackup/faubackup/src/faubackup-scatter.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** faubackup-scatter.c	11 Dec 2003 00:21:54 -0000	1.4
--- faubackup-scatter.c	11 Dec 2003 00:52:13 -0000	1.5
***************
*** 137,141 ****
  	if(size64) {
  		recv_buf( &tmp, sizeof(tmp), 0 );
! 		st.st_size += (__off64_t) ntohl(tmp)<<32;
  	}
  	/*recv_buf( &tmp, sizeof(tmp), 0 ); st.st_atime = ntohl(tmp);*/
--- 137,141 ----
  	if(size64) {
  		recv_buf( &tmp, sizeof(tmp), 0 );
! 		st.st_size += (off_t) ntohl(tmp)<<32;
  	}
  	/*recv_buf( &tmp, sizeof(tmp), 0 ); st.st_atime = ntohl(tmp);*/
***************
*** 525,532 ****
  	/* ================================================= */
  
! 	tfd = open64( actfile, O_WRONLY | O_CREAT | O_EXCL, st->st_mode & 0700 );
  	if( tfd < 0 ) {
  		if( errno!=EEXIST ) {
! 			fprintf( stderr, "%s: open64(%s, O_WRONLY): %s\n",
  					progname, actfile, strerror(errno) );
  			if( errno==ENOSPC ) exit(1);
--- 525,532 ----
  	/* ================================================= */
  
! 	tfd = open( actfile, O_WRONLY | O_CREAT | O_EXCL, st->st_mode & 0700 );
  	if( tfd < 0 ) {
  		if( errno!=EEXIST ) {
! 			fprintf( stderr, "%s: open(%s, O_WRONLY): %s\n",
  					progname, actfile, strerror(errno) );
  			if( errno==ENOSPC ) exit(1);
***************
*** 537,543 ****
  		 * to be able to handle the following files
  		 */
! 		tfd = open64( "/dev/null", O_WRONLY );
  		if( tfd < 0 ) {
! 			fprintf( stderr, "%s: open64(\"/dev/null\", O_WRONLY): %s\n",
  					progname, strerror(errno) );
  			exit( 1 );
--- 537,543 ----
  		 * to be able to handle the following files
  		 */
! 		tfd = open( "/dev/null", O_WRONLY );
  		if( tfd < 0 ) {
! 			fprintf( stderr, "%s: open(\"/dev/null\", O_WRONLY): %s\n",
  					progname, strerror(errno) );
  			exit( 1 );
***************
*** 545,549 ****
  	}
  	if( equal ) {
! 		ofd = open64( oldfile, O_RDONLY );
  		if( ofd < 0 && errno != ENOENT ) {
  			/*
--- 545,549 ----
  	}
  	if( equal ) {
! 		ofd = open( oldfile, O_RDONLY );
  		if( ofd < 0 && errno != ENOENT ) {
  			/*
***************
*** 552,556 ****
  			 * with "-rw--l---" files even with "no_root_squash"
  			 */
! 			fprintf( stderr, "%s: WARNING: open64(%s, O_RDONLY): %s\n",
  					progname, oldfile, strerror(errno) );
  			error++;
--- 552,556 ----
  			 * with "-rw--l---" files even with "no_root_squash"
  			 */
! 			fprintf( stderr, "%s: WARNING: open(%s, O_RDONLY): %s\n",
  					progname, oldfile, strerror(errno) );
  			error++;
***************
*** 593,599 ****
  				&& memcmp(buf, zero, len) == 0 ) {
  			/* found an empty page, create hole in target file */
! 			ret = lseek64( tfd, len, SEEK_CUR );
  			if( ret < 0 ) {
! 				fprintf( stderr, "%s: lseek64(%d, %lld, SEEK_CUR) on %s : %lld: %s\n",
  						progname, tfd, len, actfile, ret, strerror(errno) );
  				error++;
--- 593,599 ----
  				&& memcmp(buf, zero, len) == 0 ) {
  			/* found an empty page, create hole in target file */
! 			ret = lseek( tfd, len, SEEK_CUR );
  			if( ret < 0 ) {
! 				fprintf( stderr, "%s: lseek(%d, %lld, SEEK_CUR) on %s : %lld: %s\n",
  						progname, tfd, len, actfile, ret, strerror(errno) );
  				error++;




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/