sqsh-2.2.0 quality control last minute fixes

4 files changed, 17 insertions, 15 deletions

diff --git a/src/cmd_history.c b/src/cmd_history.c
index 8f0f05e..f16fa30 100644
--- a/src/cmd_history.c
+++ b/src/cmd_history.c
@@ -35,7 +35,7 @@
 
 /*-- Current Version --*/
 #if !defined(lint) && !defined(__LINT__)
-static char RCS_Id[] = "$Id: cmd_history.c,v 1.7 2013/04/18 11:54:43 mwesdorp Exp $" ;
+static char RCS_Id[] = "$Id: cmd_history.c,v 1.8 2013/05/07 21:18:02 mwesdorp Exp $" ;
 USE(RCS_Id)
 #endif /* !defined(lint) */
 
@@ -220,13 +220,13 @@ int cmd_hist_load( argc, argv )
 
 		if (exp_buf == NULL)
 		{
-			fprintf( stderr, "sqsh_exit: %s\n", sqsh_get_errstr() );
+			fprintf( stderr, "\\hist-load: %s\n", sqsh_get_errstr() );
 		}
 		else
 		{
 			if (sqsh_expand( history, exp_buf, 0 ) == False)
 			{
-				fprintf( stderr, "sqsh_exit: Error expanding $history: %s\n",
+				fprintf( stderr, "\\hist-load: Error expanding $history: %s\n",
 					sqsh_get_errstr() );
 			}
 			else
@@ -286,13 +286,13 @@ int cmd_hist_save( argc, argv )
 
 		if (exp_buf == NULL)
 		{
-			fprintf( stderr, "sqsh_exit: %s\n", sqsh_get_errstr() );
+			fprintf( stderr, "\\hist-save: %s\n", sqsh_get_errstr() );
 		}
 		else
 		{
 			if (sqsh_expand( history, exp_buf, 0 ) == False)
 			{
-				fprintf( stderr, "sqsh_exit: Error expanding $history: %s\n",
+				fprintf( stderr, "\\hist-save: Error expanding $history: %s\n",
 					sqsh_get_errstr() );
 			}
 			else
diff --git a/src/dsp_x.c b/src/dsp_x.c
index 19a4ded..c1b2228 100644
--- a/src/dsp_x.c
+++ b/src/dsp_x.c
@@ -38,7 +38,7 @@
 
 /*-- Current Version --*/
 #if !defined(lint) && !defined(__LINT__)
-static char RCS_Id[] = "$Id: dsp_x.c,v 1.7 2013/04/04 10:52:35 mwesdorp Exp $";
+static char RCS_Id[] = "$Id: dsp_x.c,v 1.8 2013/05/07 21:18:02 mwesdorp Exp $";
 USE(RCS_Id)
 #endif /* !defined(lint) */
 
@@ -273,7 +273,7 @@ static int dsp_x_init( fd, width, height )
 	char        *argv[1];
 	char        *cp;
 	char        *xwin_title = NULL;
-	varbuf_t    *exp_buf;
+	varbuf_t    *exp_buf    = NULL;
 
 	/*
 	 * At this point we are in the child process, the rest is pretty
@@ -417,7 +417,8 @@ static int dsp_x_init( fd, width, height )
  		      NULL);
 	XtMainLoop();
 
-	varbuf_destroy( exp_buf );
+	if (exp_buf != NULL)
+		varbuf_destroy( exp_buf );
 	exit(0);
 }
 
@@ -519,7 +520,7 @@ static int dsp_x_init( fd, width, height )
    int          argc;
    char        *argv[1];
    char        *xwin_title = NULL;
-   varbuf_t    *exp_buf;
+   varbuf_t    *exp_buf    = NULL;
 
    XFontStruct  *font = NULL; /* Font for text widget */
 
@@ -635,7 +636,8 @@ static int dsp_x_init( fd, width, height )
 	XtRealizeWidget( w_top );
 	XtMainLoop();
 
-	varbuf_destroy( exp_buf );
+	if (exp_buf != NULL)
+		varbuf_destroy( exp_buf );
 	exit(0);
 }
 
diff --git a/src/sqsh_init.c b/src/sqsh_init.c
index 0729928..c8f4e02 100644
--- a/src/sqsh_init.c
+++ b/src/sqsh_init.c
@@ -44,7 +44,7 @@
 
 /*-- Current Version --*/
 #if !defined(lint) && !defined(__LINT__)
-static char RCS_Id[] = "$Id: sqsh_init.c,v 1.5 2013/04/25 14:09:47 mwesdorp Exp $" ;
+static char RCS_Id[] = "$Id: sqsh_init.c,v 1.6 2013/05/07 21:18:02 mwesdorp Exp $" ;
 USE(RCS_Id)
 #endif /* !defined(lint) */
 
@@ -79,7 +79,6 @@ int sqsh_init()
 	 */
 	if( (g_sqlbuf = varbuf_create( 1024 )) == NULL ) {
 		sqsh_set_error( sqsh_get_error(), "varbuf_create: %s", sqsh_get_errstr());
-		varbuf_destroy( g_sqlbuf ) ;
 		return False ;
 	}
 
diff --git a/src/sqsh_job.c b/src/sqsh_job.c
index 4e9de59..19339c9 100644
--- a/src/sqsh_job.c
+++ b/src/sqsh_job.c
@@ -44,7 +44,7 @@
 
 /*-- Current Version --*/
 #if !defined(lint) && !defined(__LINT__)
-static char RCS_Id[] = "$Id: sqsh_job.c,v 1.7 2013/04/29 15:48:33 mwesdorp Exp $";
+static char RCS_Id[] = "$Id: sqsh_job.c,v 1.8 2013/05/07 21:18:02 mwesdorp Exp $";
 USE(RCS_Id)
 #endif /* !defined(lint) */
 
@@ -1002,7 +1002,7 @@ static int jobset_parse( js, job, cmd_line, while_buf, tok_flags )
 	char              *pipe_ptr = NULL ; /* Location of | */
 	char              *cp;
 	/* sqsh-2.1.6 - New variables */
-	varbuf_t	*exp_buf;
+	varbuf_t	  *exp_buf  = NULL ;
 
 
 	/*
@@ -1075,7 +1075,8 @@ static int jobset_parse( js, job, cmd_line, while_buf, tok_flags )
 
 			/*-- Create the defer file --*/
 			sprintf( defer_path, "%s/sqsh-dfr.%d-%d", tmp_dir, (int) getpid(), job->job_id );
-			varbuf_destroy( exp_buf ); /* sqsh-2.1.6 feature */
+			if ( exp_buf != NULL )
+				varbuf_destroy( exp_buf ); /* sqsh-2.1.6 feature */
 			
 			/*-- Let the job structure know where it is --*/
 			if( (job->job_output = sqsh_strdup( defer_path )) == NULL ) {