sqsh-2.5 new features and bugfixes

5 files changed, 18 insertions, 13 deletions

diff --git a/src/cmd_connect.c b/src/cmd_connect.c
index 3d06963..1fb748b 100644
--- a/src/cmd_connect.c
+++ b/src/cmd_connect.c
@@ -42,7 +42,7 @@
 
 /*-- Current Version --*/
 #if !defined(lint) && !defined(__LINT__)
-static char RCS_Id[] = "$Id: cmd_connect.c,v 1.36 2013/12/19 20:21:59 mwesdorp Exp $";
+static char RCS_Id[] = "$Id: cmd_connect.c,v 1.37 2013/12/24 13:23:19 mwesdorp Exp $";
 USE(RCS_Id)
 #endif /* !defined(lint) */
 
@@ -1647,7 +1647,7 @@ static CS_RETCODE syb_server_cb (ctx, con, msg)
              * Note that global variable g_p2fc will be reset to zero for each new batch in dsp.c.
              */
             env_get( g_env, "p2faxm",  &p2faxm );
-            p2faxm_int = atoi(p2faxm);
+            p2faxm_int = (p2faxm != NULL) ? atoi(p2faxm) : 0;
             if (++g_p2fc       > p2faxm_int &&
                 p2faxm_int     > 0          &&
                 g_p2f_fp      != NULL       &&
diff --git a/src/var_ctlib.c b/src/var_ctlib.c
index d84abb3..c9384cb 100644
--- a/src/var_ctlib.c
+++ b/src/var_ctlib.c
@@ -34,7 +34,7 @@
 
 /*-- Current Version --*/
 #if !defined(lint) && !defined(__LINT__)
-static char RCS_Id[] = "$Id: var_ctlib.c,v 1.2 2009/04/14 10:22:18 mwesdorp Exp $" ;
+static char RCS_Id[] = "$Id: var_ctlib.c,v 1.3 2013/12/24 13:23:19 mwesdorp Exp $" ;
 USE(RCS_Id)
 #endif /* !defined(lint) */
 
@@ -107,12 +107,15 @@ int var_set_packet( env, var_name, var_value )
 		return False;
 	}
 
+	if (*var_value == NULL)
+		return True;
+
 	packet_size = atoi(*var_value);
 
 	if (packet_size <= 0 || (packet_size % 512) != 0)
 	{
 		sqsh_set_error( SQSH_E_INVAL,
-			"Invalid packet size.  Must a multiple of 512 bytes" );
+			"Invalid packet size. Must be a multiple of 512 bytes" );
 		return False;
 	}
 
diff --git a/src/var_dsp.c b/src/var_dsp.c
index 83488cc..f475f81 100644
--- a/src/var_dsp.c
+++ b/src/var_dsp.c
@@ -34,7 +34,7 @@
 
 /*-- Current Version --*/
 #if !defined(lint) && !defined(__LINT__)
-static char RCS_Id[] = "$Id: var_dsp.c,v 1.4 2013/02/19 18:06:43 mwesdorp Exp $";
+static char RCS_Id[] = "$Id: var_dsp.c,v 1.5 2013/12/24 13:23:19 mwesdorp Exp $";
 USE(RCS_Id)
 #endif /* !defined(lint) */
 
@@ -363,7 +363,7 @@ int var_set_colwidth( env, var_name, var_value )
 		return False;
 	}
 
-	width = atoi(*var_value);
+	width = (*var_value != NULL) ? atoi(*var_value) : 30;
 
 	if (dsp_prop( DSP_SET,
 	              DSP_COLWIDTH, 
@@ -443,7 +443,7 @@ int var_set_width( env, var_name, var_value )
 		return False;
 	}
 
-	width = atoi(*var_value);
+	width = (*var_value != NULL) ? atoi(*var_value) : 0;
 
 	if (dsp_prop( DSP_SET,
 	              DSP_WIDTH, 
@@ -800,7 +800,7 @@ int var_set_maxlen( env, var_name, var_value )
 		return False;
 	}
 
-	maxlen = atoi(*var_value);
+	maxlen = (*var_value != NULL) ? atoi(*var_value) : 0;
 
 	if (dsp_prop( DSP_SET, DSP_MAXLEN, (void*)&maxlen, DSP_UNUSED )
 		!= DSP_SUCCEED)
diff --git a/src/var_misc.c b/src/var_misc.c
index 189f668..4582150 100644
--- a/src/var_misc.c
+++ b/src/var_misc.c
@@ -35,7 +35,7 @@
 
 /*-- Current Version --*/
 #if !defined(lint) && !defined(__LINT__)
-static char RCS_Id[] = "$Id: var_misc.c,v 1.5 2013/12/08 12:43:58 mwesdorp Exp $" ;
+static char RCS_Id[] = "$Id: var_misc.c,v 1.6 2013/12/24 13:23:19 mwesdorp Exp $" ;
 USE(RCS_Id)
 #endif /* !defined(lint) */
 
@@ -247,8 +247,10 @@ int var_set_nullint( env, var_name, var_value )
 {
 	char *cptr ;
 
-	if( var_value == NULL || *var_value == NULL || strcmp(*var_value, "NULL") == 0 )
-		*var_value = "0" ;
+	if( var_value == NULL || *var_value == NULL || strcmp(*var_value, "NULL") == 0 ) {
+		*var_value = NULL ;
+		return True;
+	}
 
 	/*-- Skip whitespace --*/
 	for( cptr = *var_value; *cptr != '\0' && isspace( (int)*cptr ); ++cptr ) ;
diff --git a/src/var_readline.c b/src/var_readline.c
index 16fc10b..e6e41d7 100644
--- a/src/var_readline.c
+++ b/src/var_readline.c
@@ -32,7 +32,7 @@
 
 /*-- Current Version --*/
 #if !defined(lint) && !defined(__LINT__)
-static char RCS_Id[] = "$Id: var_readline.c,v 1.2 2012/03/14 09:17:51 mwesdorp Exp $" ;
+static char RCS_Id[] = "$Id: var_readline.c,v 1.3 2013/12/24 13:23:19 mwesdorp Exp $" ;
 USE(RCS_Id)
 #endif /* !defined(lint) */
 
@@ -48,7 +48,7 @@ int var_set_rl_histsize( env, var_name, var_value )
 		return False;
 	}
 
-	stifle_value = atoi(*var_value);
+	stifle_value = (*var_value != NULL) ? atoi(*var_value) : 0;
 
 #if defined(USE_READLINE)
 	if (stifle_value <= 0)