fix plot save and save error

jcupitt · jcupitt · commit f6b6ed7b9879 · 2013-11-19T19:09:13.000Z
save errors were not being shown

saving a plot didn't expand env vars
diff --git a/Makefile.am b/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = \
 	bootstrap.sh \
 	doc \
 	proj \
-	acinclude.m4 \
+	m4 \
 	nip2.desktop.in \
 	nip2.xml 
 
diff --git a/src/boxes.c b/src/boxes.c
@@ -142,7 +142,7 @@ box_alert( GtkWidget *par )
 {
 	char buf[MAX_DIALOG_TEXT];
 
-	if( !main_option_batch ) {
+	if( main_option_batch ) {
 		/* No X, just print.
 		 */
 		fprintf( stderr, "%s\n", error_get_top() );
diff --git a/src/conversion.c b/src/conversion.c
@@ -467,8 +467,6 @@ im_lintrauc( double a, IMAGE *in, double b, IMAGE *out )
 { 
         LintraInfo *inf;
 
-        /* Check args.
-         */
         if( in->Coding != IM_CODING_NONE ) {
                 im_error( "im_lintrauc", _( "not uncoded" ) );
                 return( -1 );
@@ -479,17 +477,13 @@ im_lintrauc( double a, IMAGE *in, double b, IMAGE *out )
 	out->Bbits = IM_BBITS_BYTE;
 	out->BandFmt = IM_BANDFMT_UCHAR;
 
-        /* Make space for a little buffer.
-         */
         if( !(inf = IM_NEW( out, LintraInfo )) )
                 return( -1 );
 	inf->a = a;
 	inf->b = b;
 	inf->in = in;
 	inf->out = out;
 
-        /* Generate!
-         */
 	if( im_wrapone( in, out,
 		(im_wrapone_fn) lintrauc_gen, in, inf ) )
 		return( -1 );
@@ -702,8 +696,9 @@ conversion_make_repaint( Conversion *conv, IMAGE *in )
 			(conv->scale != 1.0 || conv->offset != 0.0) ) {
 			IMAGE *t = im_open_local( out, "conv:1", "p" );
 
-			if( !t || im_lintrauc( conv->scale, in, 
-				conv->offset, t ) ) {
+			if( !t || 
+				im_lintrauc( conv->scale, in, 
+					conv->offset, t ) ) {
 				im_close( out );
 				return( NULL );
 			}
diff --git a/src/main.c b/src/main.c
@@ -1465,7 +1465,7 @@ main( int argc, char *argv[] )
 		}
 	}
 
-	/* Abandon batch mode if there are startup errors.
+	/* In batch mode give up if there are startup errors.
 	 */
 	if( main_option_batch ) {
 		if( !main_log_is_empty() ) {
diff --git a/src/plot.c b/src/plot.c
@@ -432,9 +432,9 @@ plot_graphic_save( Classmodel *classmodel,
 {
 	Plot *plot = PLOT( classmodel );
 	ImageValue *value = &plot->value;
-	char buf[MAX_STRSIZE];
+	char buf[FILENAME_MAX];
 
-	strcpy( buf, filename );
+	expand_variables( filename, buf );
 	filesel_add_mode( buf );
 
 	if( value->ii )

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ box_alert( GtkWidget *par )`
`142`	`142`	`{`
`143`	`143`	`char buf[MAX_DIALOG_TEXT];`
`144`	`144`
`145`		`- if( !main_option_batch ) {`
	`145`	`+ if( main_option_batch ) {`
`146`	`146`	`/* No X, just print.`
`147`	`147`	`*/`
`148`	`148`	`fprintf( stderr, "%s\n", error_get_top() );`
Original file line number	Diff line number	Diff line change
`@@ -1465,7 +1465,7 @@ main( int argc, char *argv[] )`
`1465`	`1465`	`}`
`1466`	`1466`	`}`
`1467`	`1467`
`1468`		`- /* Abandon batch mode if there are startup errors.`
	`1468`	`+ /* In batch mode give up if there are startup errors.`
`1469`	`1469`	`*/`
`1470`	`1470`	`if( main_option_batch ) {`
`1471`	`1471`	`if( !main_log_is_empty() ) {`