Attachment 426 Details for Bug 1088 – 2nd proposed patch

[patch] 2nd proposed patch

p (text/plain), 1.85 KB, created by SATOH Fumiyasu on 2004-03-04 20:04:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: SATOH Fumiyasu

Created: 2004-03-04 20:04:13 UTC

Size: 1.85 KB

patch

obsolete

>Index: client/client.c
>===================================================================
>RCS file: /cvsroot/samba/source/client/client.c,v
>retrieving revision 1.209.2.51
>diff -u -p -r1.209.2.51 client.c
>--- client/client.c	3 Mar 2004 23:14:23 -0000	1.209.2.51
>+++ client/client.c	5 Mar 2004 03:07:17 -0000
>@@ -2846,27 +2846,6 @@ static int do_message_op(void)
> }
> 
> 
>-/**
>- * Process "-L hostname" option.
>- *
>- * We don't actually do anything yet -- we just stash the name in a
>- * global variable and do the query when all options have been read.
>- **/
>-
>-static void remember_query_host(const char *arg,
>-				pstring query_host)
>-{
>-	char *slash;
>-	
>-	while (*arg == '\\' || *arg == '/')
>-		arg++;
>-	pstrcpy(query_host, arg);
>-	if ((slash = strchr(query_host, '/'))
>-	    || (slash = strchr(query_host, '\\'))) {
>-		*slash = 0;
>-	}
>-}
>-
> /****************************************************************************
>   main program
> ****************************************************************************/
>@@ -2961,7 +2940,7 @@ static void remember_query_host(const ch
> 			break;
> 
> 		case 'L':
>-			remember_query_host(poptGetOptArg(pc), query_host);
>+			pstrcpy(query_host, poptGetOptArg(pc));
> 			break;
> 		case 't':
> 			pstrcpy(term_code, poptGetOptArg(pc));
>@@ -3069,14 +3048,25 @@ static void remember_query_host(const ch
> 		return do_tar_op(base_directory);
> 	}
> 
>-	if ((p=strchr_m(query_host,'#'))) {
>-		*p = 0;
>-		p++;
>-		sscanf(p, "%x", &name_type);
>-	}
>-  
> 	if (*query_host) {
>-		return do_host_query(query_host);
>+		char *qhost = query_host;
>+		char *slash;
>+
>+		while (*qhost == '\\' || *qhost == '/')
>+			qhost++;
>+
>+		if ((slash = strchr_m(qhost, '/'))
>+		    || (slash = strchr_m(qhost, '\\'))) {
>+			*slash = 0;
>+		}
>+
>+		if ((p=strchr_m(qhost, '#'))) {
>+			*p = 0;
>+			p++;
>+			sscanf(p, "%x", &name_type);
>+		}
>+  
>+		return do_host_query(qhost);
> 	}
> 
> 	if (message) {

Actions: View

Attachments on bug 1088: 404 | 426