[Radmind-commit] radmind transcript.c,1.115,1.116

[Patrick M. <ume...@us...>]

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

Modified Files:
	transcript.c 
Log Message:
fsdiff displays the command file name when reporting command file line errors.  [ Feature #1592739 ]


Index: transcript.c
===================================================================
RCS file: /cvsroot/radmind/radmind/transcript.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** transcript.c	28 Sep 2006 18:55:52 -0000	1.115
--- transcript.c	26 Jan 2007 18:26:08 -0000	1.116
***************
*** 814,818 ****
  	length = strlen( line );
  	if ( line[ length - 1 ] != '\n' ) {
! 	    fprintf( stderr, "command: line %d: line too long\n", linenum );
  	    return( -1 );
  	}
--- 814,819 ----
  	length = strlen( line );
  	if ( line[ length - 1 ] != '\n' ) {
! 	    fprintf( stderr, "command file %s: line %d: line too long\n",
! 		kfile, linenum );
  	    return( -1 );
  	}
***************
*** 824,829 ****
  
  	if ( ac != 2 ) {
! 	    fprintf( stderr, "command: line %d: expected 2 arguments, got %d\n",
! 		    linenum, ac );
  	    return( -1 );
  	} 
--- 825,831 ----
  
  	if ( ac != 2 ) {
! 	    fprintf( stderr,
! 		"command file %s: line %d: expected 2 arguments, got %d\n",
! 		kfile, linenum, ac );
  	    return( -1 );
  	} 
***************
*** 833,840 ****
  	    if ( snprintf( fullpath, MAXPATHLEN, "%s%s", kdir,
  		    av[ 1 ] ) >= MAXPATHLEN ) {
! 		fprintf( stderr, "command: line %d: path too long\n",
! 			linenum );
! 		fprintf( stderr, "command: line %d: %s%s\n",
! 			linenum, kdir, av[ 1 ] );
  		return( -1 );
  	    }
--- 835,842 ----
  	    if ( snprintf( fullpath, MAXPATHLEN, "%s%s", kdir,
  		    av[ 1 ] ) >= MAXPATHLEN ) {
! 		fprintf( stderr, "comand file %s: line %d: path too long\n",
! 			kfile, linenum );
! 		fprintf( stderr, "command file %s: line %d: %s%s\n",
! 			kfile, linenum, kdir, av[ 1 ] );
  		return( -1 );
  	    }
***************
*** 849,856 ****
  	    if ( snprintf( fullpath, MAXPATHLEN, "%s/%s/%s", _RADMIND_PATH,
  			subpath, av[ 1 ] ) >= MAXPATHLEN ) {
! 		fprintf( stderr, "command: line %d: path too long\n",
! 			linenum );
! 		fprintf( stderr, "command: line %d: %s%s\n",
! 			linenum, kdir, av[ 1 ] );
  		return( -1 );
  	    }
--- 851,858 ----
  	    if ( snprintf( fullpath, MAXPATHLEN, "%s/%s/%s", _RADMIND_PATH,
  			subpath, av[ 1 ] ) >= MAXPATHLEN ) {
! 		fprintf( stderr, "command file %s: line %d: path too long\n",
! 			kfile, linenum );
! 		fprintf( stderr, "command file %s: line %d: %s%s\n",
! 			kfile, linenum, kdir, av[ 1 ] );
  		return( -1 );
  	    }
***************
*** 866,870 ****
  	    if ( list_check( kfile_list, fullpath )) {
  		fprintf( stderr,
! 		    "%s: line %d: command file loop: %s already included\n",
  		    kfile, linenum, av[ 1 ] );
  		return( -1 );
--- 868,872 ----
  	    if ( list_check( kfile_list, fullpath )) {
  		fprintf( stderr,
! 		    "command file %s: line %d: command file loop: %s already included\n",
  		    kfile, linenum, av[ 1 ] );
  		return( -1 );
***************
*** 903,908 ****
  
  	default:
! 	    fprintf( stderr, "command: line %d: '%s' invalid\n",
! 		    linenum, av[ 0 ] );
  	    return( -1 );
  	}
--- 905,910 ----
  
  	default:
! 	    fprintf( stderr, "command file %s: line %d: '%s' invalid\n",
! 		    kfile, linenum, av[ 0 ] );
  	    return( -1 );
  	}