Attachment 252171 Details for Bug 370501 – patch -- allow prefixpath to start with '\\' and change '/' to '\\' in prefixpath

[patch] patch -- allow prefixpath to start with '\\' and change '/' to '\\' in prefixpath

mount.cifs-path-delimiter.patch (text/plain), 1.56 KB, created by Jeff Layton on 2007-11-08 21:27:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-11-08 21:27:22 UTC

Size: 1.56 KB

patch

obsolete

>--- samba-3.2.0pre1/source/client/mount.cifs.c.~1~
>+++ samba-3.2.0pre1/source/client/mount.cifs.c
>@@ -752,7 +752,7 @@ static char * parse_server(char ** punc_
> {
> 	char * unc_name = *punc_name;
> 	int length = strnlen(unc_name,1024);
>-	char * share;
>+	char * share, * oldpp, * newpp, * savedpp;
> 	char * ipaddress_string = NULL;
> 	struct hostent * host_entry = NULL;
> 	struct in_addr server_ipaddr;
>@@ -808,11 +808,37 @@ continue_unc_parsing:
> 					host_entry = gethostbyname(unc_name);
> 				}
> 				*(share - 1) = '/'; /* put the slash back */
>-				if ((prefixpath = strchr(share, '/'))) {
>+				if ((prefixpath = strchr(share, '/')) || (prefixpath = strchr(share, '\\'))) {
> 					*prefixpath = 0;  /* permanently terminate the string */
> 					if (!strlen(++prefixpath))
> 						prefixpath = NULL; /* this needs to be done explicitly */
> 				}
>+
>+				/*
>+				 * convert delimiters in prefixpath from '/' to '\', unless the '/' is
>+				 * escaped by prefixing it with a '\'
>+				 */
>+				if (prefixpath != NULL) {
>+					newpp = prefixpath;
>+					savedpp = strdup(prefixpath);
>+					oldpp = savedpp;
>+					/* if the malloc fails, just pass prefixpath as-is */
>+					while (oldpp && *oldpp) {
>+						printf("prefixpath = %s\n", prefixpath);
>+						if (*oldpp == '\\' && *(oldpp+1) == '/') {
>+							*newpp = '/';
>+							oldpp++;
>+						} else if (*oldpp == '/') {
>+							*newpp = '\\';
>+						}
>+						newpp++;
>+						oldpp++;
>+					}
>+					if (savedpp) {
>+						newpp = '\0';
>+						free(savedpp);
>+					}
>+				}
> 				if(got_ip) {
> 					if(verboseflag)
> 						printf("ip address specified explicitly\n");

Actions: View | Diff

Attachments on bug 370501: 251461 | 251491 | 252171 | 252681 | 253241 | 256911