xemacs-beta: lib-src/gnuclient.c comparison

Import from CVS: tag r21-0b57

comparison

equal deleted inserted replaced

-:a2fc9afbef65
+:afd57c14dfc8
 {
 int len;
 fullpath[0] = '\0';
-if (filename[0] && filename[0] != '/')
+if (filename[0] && filename[0] == '/')
-{	/* relative filename */
+{
+/* Absolute (unix-style) pathname.  Do nothing */
+strcat (fullpath, filename);
+}
+#ifdef  __CYGWIN32__
+else if (filename[0] && filename[0] == '\\' &&
+filename[1] && filename[1] == '\\')
+{
+/* This path includes the server name (something like
+"\\server\path"), so we assume it's absolute.  Do nothing to
+it. */
+strcat (fullpath, filename);
+}
+else if (filename[0] &&
+filename[1] && filename[1] == ':' &&
+filename[2] && filename[2] == '\\')
+{
+/* Absolute pathname with drive letter.  Convert "<drive>:"
+to "//<drive>/". */
+strcat (fullpath, "//");
+strncat (fullpath, filename, 1);
+strcat (fullpath, &filename[2]);
+}
+#endif
+else
+{
+/* Assume relative Unix style path.  Get the current directory
+and prepend it.  FIXME: need to fix the case of DOS paths like
+"\foo", where we need to get the current drive. */
 strcat (fullpath, get_current_working_directory ());
 len = strlen (fullpath);
 if (len > 0 && fullpath[len-1] == '/')	/* trailing slash already? */
 	;					/* yep */
 else
 	strcat (fullpath, "/");		/* nope, append trailing slash */
-} /* if */
+}
-strcat (fullpath,filename);
 } /* filename_expand */
 /* Encase the string in quotes, escape all the backslashes and quotes
 in string.  */
 static char *

Mercurial > hg > xemacs-beta