svn commit: samba r8755 - branches/SAMBA_3_0/source/utils trunk/source/utils

[jerry at samba.org]

Author: jerry
Date: 2005-07-25 15:04:25 +0000 (Mon, 25 Jul 2005)
New Revision: 8755

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8755

Log:
more malloc fixes
Modified:
   branches/SAMBA_3_0/source/utils/smbget.c
   trunk/source/utils/smbget.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/smbget.c
===================================================================
--- branches/SAMBA_3_0/source/utils/smbget.c	2005-07-25 13:19:21 UTC (rev 8754)
+++ branches/SAMBA_3_0/source/utils/smbget.c	2005-07-25 15:04:25 UTC (rev 8755)
@@ -101,8 +101,8 @@
 
 	if(workgroup)strncpy(wg, workgroup, wglen-1);
 
-	wgtmp = strndup(wg, wglen); 
-	usertmp = strndup(un, unlen);
+	wgtmp = SMB_STRNDUP(wg, wglen); 
+	usertmp = SMB_STRNDUP(un, unlen);
 	if(!quiet)printf("Using workgroup %s, %s%s\n", wgtmp, *usertmp?"user ":"guest user", usertmp);
 	free(wgtmp); free(usertmp);
 }
@@ -230,7 +230,7 @@
 	if(columns) {
 		int required = strlen(name), available = columns - len - strlen("[] ");
 		if(required > available) asprintf(&filename, "...%s", name + required - available + 3);
-		else filename = strndup(name, available);
+		else filename = SMB_STRNDUP(name, available);
 	} else filename = SMB_STRDUP(name);
 
 	fprintf(stderr, "\r[%s] %s", filename, status);

Modified: trunk/source/utils/smbget.c
===================================================================
--- trunk/source/utils/smbget.c	2005-07-25 13:19:21 UTC (rev 8754)
+++ trunk/source/utils/smbget.c	2005-07-25 15:04:25 UTC (rev 8755)
@@ -101,8 +101,8 @@
 
 	if(workgroup)strncpy(wg, workgroup, wglen-1);
 
-	wgtmp = strndup(wg, wglen); 
-	usertmp = strndup(un, unlen);
+	wgtmp = SMB_STRNDUP(wg, wglen); 
+	usertmp = SMB_STRNDUP(un, unlen);
 	if(!quiet)printf("Using workgroup %s, %s%s\n", wgtmp, *usertmp?"user ":"guest user", usertmp);
 	free(wgtmp); free(usertmp);
 }
@@ -230,7 +230,7 @@
 	if(columns) {
 		int required = strlen(name), available = columns - len - strlen("[] ");
 		if(required > available) asprintf(&filename, "...%s", name + required - available + 3);
-		else filename = strndup(name, available);
+		else filename = SMB_STRNDUP(name, available);
 	} else filename = SMB_STRDUP(name);
 
 	fprintf(stderr, "\r[%s] %s", filename, status);