[Radmind-commit] radmind lmerge.c,1.57,1.58

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3813

Modified Files:
	lmerge.c 
Log Message:
Eliminate old workaround for broken mkdir on old versions of Mac OS X, since ourcode assumes at least 10.4 to build in the first place.


Index: lmerge.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lmerge.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** lmerge.c	14 Jul 2008 20:50:50 -0000	1.57
--- lmerge.c	1 Aug 2009 18:25:31 -0000	1.58
***************
*** 498,547 ****
  	     * mkdirs() called.
  	     */
! 	    /* Fix for broken mkdir on OS X */
! 	    if ( *trans[ candidate ]->t_filepath == '/' ) {
! 		if ( snprintf( opath, MAXPATHLEN, "%s/%s%s",
! 			trans[ candidate ]->t_file_root,
! 			trans[ fileloc ]->t_tran_name,
! 			trans[ candidate ]->t_filepath ) >= MAXPATHLEN ) {
! 		    fprintf( stderr, "%s/%s/%s: path too long\n",
! 			trans[ candidate ]->t_file_root,
! 			trans[ fileloc ]->t_tran_name,
! 			trans[ candidate ]->t_filepath );
! 		    exit( 2 );
! 		}
! 	    } else {
! 		if ( snprintf( opath, MAXPATHLEN, "%s/%s/%s",
! 			trans[ candidate ]->t_file_root,
! 			trans[ fileloc ]->t_tran_name,
! 			trans[ candidate ]->t_filepath ) >= MAXPATHLEN ) {
! 		    fprintf( stderr, "%s/%s/%s: path too long\n",
! 			trans[ candidate ]->t_file_root,
! 			trans[ fileloc ]->t_tran_name,
! 			trans[ candidate ]->t_filepath );
! 		    exit( 2 );
! 		}
  	    }
  
  	    if ( !force ) {
! 		/* Fix for broken mkdir on OS X */
! 		if ( *trans[ candidate ]->t_filepath == '/' ) {
! 		    if ( snprintf( npath, MAXPATHLEN, "%s/%s.%d/%s",
! 			    file_root, tran_name, (int)getpid(),
! 			    trans[ candidate ]->t_filepath )
! 			    >= MAXPATHLEN ) {
! 			fprintf( stderr, "%s/%s.%d/%s: path too long\n",
! 			    file_root, tran_name, (int)getpid(),
! 			    trans[ candidate ]->t_filepath );
! 			exit( 2 );
! 		    }
! 		} else {
! 		    if ( snprintf( npath, MAXPATHLEN, "%s/%s.%d/%s",
! 			    file_root, tran_name, (int)getpid(),
! 			    trans[ candidate ]->t_filepath ) >= MAXPATHLEN ) {
! 			fprintf( stderr, "%s/%s.%d/%s: path too long\n",
! 			    file_root, tran_name, (int)getpid(),
! 			    trans[ candidate ]->t_filepath );
! 			exit( 2 );
! 		    }
  		}
  	    } else {
--- 498,520 ----
  	     * mkdirs() called.
  	     */
! 	    if ( snprintf( opath, MAXPATHLEN, "%s/%s/%s",
! 		    trans[ candidate ]->t_file_root,
! 		    trans[ fileloc ]->t_tran_name,
! 		    trans[ candidate ]->t_filepath ) >= MAXPATHLEN ) {
! 		fprintf( stderr, "%s/%s/%s: path too long\n",
! 		    trans[ candidate ]->t_file_root,
! 		    trans[ fileloc ]->t_tran_name,
! 		    trans[ candidate ]->t_filepath );
! 		exit( 2 );
  	    }
  
  	    if ( !force ) {
! 		if ( snprintf( npath, MAXPATHLEN, "%s/%s.%d/%s",
! 			file_root, tran_name, (int)getpid(),
! 			trans[ candidate ]->t_filepath ) >= MAXPATHLEN ) {
! 		    fprintf( stderr, "%s/%s.%d/%s: path too long\n",
! 			file_root, tran_name, (int)getpid(),
! 			trans[ candidate ]->t_filepath );
! 		    exit( 2 );
  		}
  	    } else {
***************
*** 562,612 ****
  			!= NULL ) {
  		    if ( !force ) {
! 			/* Fix for broken mkdir on OS X */
! 			if ( *trans[ candidate ]->t_filepath == '/' ) {
! 			    if ( snprintf( npath, MAXPATHLEN,
! 				    "%s/%s.%d%s",
! 				    file_root, tran_name, (int)getpid(), 
! 				    trans[ candidate ]->t_filepath )
! 				    >= MAXPATHLEN ) {
! 				fprintf( stderr,
! 				    "%s/%s.%d%s: path too long\n",
! 				    file_root, tran_name, (int)getpid(),
! 				    trans[ candidate ]->t_filepath );
! 				exit( 2 );
! 			    }
! 			} else {
! 			    if ( snprintf( npath, MAXPATHLEN,
! 				    "%s/%s.%d/%s",
! 				    file_root, tran_name, (int)getpid(), 
! 				    trans[ candidate ]->t_filepath )
! 				    >= MAXPATHLEN ) {
! 				fprintf( stderr,
! 				    "%s/%s.%d/%s: path too long\n",
! 				    file_root, tran_name, (int)getpid(),
! 				    trans[ candidate ]->t_filepath );
! 				exit( 2 );
! 			    }
  			}
  		    } else {
! 			if ( *trans[ candidate ]->t_filepath == '/' ) {
! 			    if ( snprintf( npath, MAXPATHLEN,
! 				    "%s/%s%s", file_root, tran_name,
! 				    trans[ candidate ]->t_filepath )
! 				    >= MAXPATHLEN ) {
! 				fprintf( stderr,
! 				    "%s/%s%s: path too long\n", file_root,
! 				    tran_name, trans[ candidate ]->t_filepath );
! 				exit( 2 );
! 			    }
! 			} else {
! 			    if ( snprintf( npath, MAXPATHLEN,
! 				    "%s/%s/%s", file_root, tran_name,
! 				    trans[ candidate ]->t_filepath )
! 				    >= MAXPATHLEN ) {
! 				fprintf( stderr,
! 				    "%s/%s/%s: path too long\n", file_root,
! 				    tran_name, trans[ candidate ]->t_filepath );
! 				exit( 2 );
! 			    }
  			}
  		    }
--- 535,558 ----
  			!= NULL ) {
  		    if ( !force ) {
! 			if ( snprintf( npath, MAXPATHLEN,
! 				"%s/%s.%d/%s",
! 				file_root, tran_name, (int)getpid(), 
! 				trans[ candidate ]->t_filepath )
! 				>= MAXPATHLEN ) {
! 			    fprintf( stderr,
! 				"%s/%s.%d/%s: path too long\n",
! 				file_root, tran_name, (int)getpid(),
! 				trans[ candidate ]->t_filepath );
! 			    exit( 2 );
  			}
  		    } else {
! 			if ( snprintf( npath, MAXPATHLEN,
! 				"%s/%s/%s", file_root, tran_name,
! 				trans[ candidate ]->t_filepath )
! 				>= MAXPATHLEN ) {
! 			    fprintf( stderr,
! 				"%s/%s/%s: path too long\n", file_root,
! 				tran_name, trans[ candidate ]->t_filepath );
! 			    exit( 2 );
  			}
  		    }