use variable instead of harcoded values

EricDeveaud · EricDeveaud · commit dee279081f03 · 2014-12-15T13:22:41.000+01:00
diff --git a/ModuleCmd_Avail.c b/ModuleCmd_Avail.c
@@ -1376,7 +1376,7 @@ static	char *mkdirnm(	char	*dir,
     /**
      **  Check whether the full path fits into the buffer
      **/
-    if( (int) ( strlen( dir) + 1 + strlen( file) + 1 ) > MOD_BUFSIZE) {
+    if( (int) ( strlen( dir) + strlen(psep) + strlen( file) + 1 ) > MOD_BUFSIZE) {
 	if( OK != ErrorLogger( ERR_NAMETOLONG, LOC, dir, file, NULL))
 	    return( NULL);
     }
diff --git a/cmdUname.c b/cmdUname.c
@@ -38,6 +38,7 @@ static void *UseId[] = { &UseId, Id };
 /** ************************************************************************ **/
 
 #include "modules_def.h"
+#include <sys/param.h>
 
 #ifdef HAVE_UNAME
 #  include <sys/utsname.h>
@@ -65,7 +66,7 @@ typedef	struct	utsname {
 /** ************************************************************************ **/
 
 #define	NAMELEN		(8 + 1)		/** 8 chars + 1 terminator	     **/
-#define	DOMAINLEN	(64 + 1)	/** 64 chars + 1 terminator	     **/
+#define	DOMAINLEN	(MAXHOSTNAMELEN + 1)	/** from from <sys/param.h>  **/
 
 /** ************************************************************************ **/
 /** 				    LOCAL DATA				     **/
@@ -122,6 +123,8 @@ int cmdUname(
 	int             length,		/** argument string length	     **/
 	                namestruct_init = 0;
 					/** namestruct init flag	     **/
+	*domain ='\0';
+
 #ifdef HAVE_UNAME
 	struct utsname  namestruct;
 #else
@@ -188,9 +191,13 @@ int cmdUname(
 		if (-1 == getdomainname(domain, DOMAINLEN))
 			if (OK != ErrorLogger(ERR_GETDOMAINNAME, LOC, NULL))
 				return (TCL_ERROR); /** -- EXIT (FAILURE) -> **/
-#else
-	strncat(domain, _(em_unknown), DOMAINLEN);
 #endif
+
+    /**
+     **  some oses (BSD) return empty domain
+     **/
+	if (! *domain)
+		strncat(domain, _(em_unknown), DOMAINLEN);
     /**
      **  Now the name structure surely IS initialized
      **/

Original file line number	Diff line number	Diff line change
`@@ -1376,7 +1376,7 @@ static char mkdirnm( char dir,`
`1376`	`1376`	`/**`
`1377`	`1377`	`** Check whether the full path fits into the buffer`
`1378`	`1378`	`**/`
`1379`		`- if( (int) ( strlen( dir) + 1 + strlen( file) + 1 ) > MOD_BUFSIZE) {`
	`1379`	`+ if( (int) ( strlen( dir) + strlen(psep) + strlen( file) + 1 ) > MOD_BUFSIZE) {`
`1380`	`1380`	`if( OK != ErrorLogger( ERR_NAMETOLONG, LOC, dir, file, NULL))`
`1381`	`1381`	`return( NULL);`
`1382`	`1382`	`}`