svn commit: samba r4697 - in branches/SAMBA_3_0/source/client: .

jra at samba.org jra at samba.org
Wed Jan 12 01:25:16 GMT 2005


Author: jra
Date: 2005-01-12 01:25:14 +0000 (Wed, 12 Jan 2005)
New Revision: 4697

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

Log:
Fix for bug #2231 inspired by brad.ellis at its.monash.edu.au.
Remove double "\\" from findfirst.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/client/client.c


Changeset:
Modified: branches/SAMBA_3_0/source/client/client.c
===================================================================
--- branches/SAMBA_3_0/source/client/client.c	2005-01-12 01:25:13 UTC (rev 4696)
+++ branches/SAMBA_3_0/source/client/client.c	2005-01-12 01:25:14 UTC (rev 4697)
@@ -582,17 +582,17 @@
 		if(mask[strlen(mask)-1]!='\\')
 			pstrcat(mask,"\\");
 	} else {
-		*mask = '\0';
+		pstrcpy(mask, "\\");
 	}
 	
 	if (next_token_nr(NULL,buf,NULL,sizeof(buf))) {
 		dos_format(p);
 		if (*p == '\\')
-			pstrcpy(mask,p);
+			pstrcpy(mask,p + 1);
 		else
 			pstrcat(mask,p);
 	} else {
-		pstrcat(mask,"\\*");
+		pstrcat(mask,"*");
 	}
 
 	do_list(mask, attribute, display_finfo, recurse, True);



More information about the samba-cvs mailing list