Changeset 116 for trunk/src/emx

Timestamp:

May 10, 2003, 4:38:40 AM (22 years ago)

Author:

bird

Message:

#416: Quote filenames in link386 input.

File:

• trunk/src/emx/src/emxomf/emxomfld.c (modified) (13 diffs, 1 prop)

trunk/src/emx/src/emxomf/emxomfld.c

@@ -137 +137 @@
 static void add_name_list (name_list ***add, const char *src);
 static void conv_path (char *name);
-static void put_arg (const char *src, int path);
+static void put_arg (const char *src, int path, int quotable);
 static void put_args (const name_list *list, int paths);
 static void make_env (void);
@@ -169 +169 @@
 {
   void *p;
-  
+
   p = malloc (n);
   if (p == NULL)
@@ -187 +187 @@
 {
   char *p;
-  
+
   p = xmalloc (strlen (s) + 1);
   strcpy (p, s);
@@ -226 +226 @@
    If PATH is non-zero, SRC is a path name and slashes are to be
    replaced by backslashes.  If the command line gets too long, a
-   response file is created. */
-
-static void put_arg (const char *src, int path)
+   response file is created.
+   If quotable is non-zero SRC will be quoted. This is required for
+   supporting files names which includes '+' and spaces. */
+
+static void put_arg (const char *src, int path, int quotable)
 {
   int len, max_len;
@@ -251 +253 @@
 
       len = strlen (src);
-      tmp = alloca (len + 1);
-      strcpy (tmp, src);
+      tmp = alloca (len + (quotable ? 3 : 1));
       if (path)
-        conv_path (tmp);
+        {
+          /* needs quoting? */
+          if (quotable)
+            {
+              *tmp = '"';
+              strcpy (tmp+1, src);
+              tmp[++len] = '"';
+              tmp[++len] = '\0';
+            }
+          else
+            strcpy (tmp, src);
+          conv_path (tmp);
+        }
+      else
+        strcpy (tmp, src);
+
 
       /* Check if we've reached the maximum line length.  If the
@@ -362 +378 @@
   while (list != NULL)
     {
-      put_arg (list->name, paths);
+      put_arg (list->name, paths, paths);
       list = list->next;
     }
@@ -695 +711 @@
   */
 
-  put_arg (linker_name, TRUE);
+  put_arg (linker_name, TRUE, FALSE);
 
   /* If the linker is ILINK, don't use the /BAT{CH} option */
   t = _getname (linker_name);
   if (strnicmp (t, "ILINK", 5))
-  put_arg ("/bat", FALSE);
+    put_arg ("/bat", FALSE, FALSE);
   else
-    put_arg ("/nofree", FALSE);
-  put_arg ("/nol", FALSE);
-  put_arg ("/noe", FALSE);
-  put_arg ("/noi", FALSE);
-  put_arg ("/packc", FALSE);
+    put_arg ("/nofree", FALSE, FALSE);
+  put_arg ("/nol", FALSE, FALSE);
+  put_arg ("/noe", FALSE, FALSE);
+  put_arg ("/noi", FALSE, FALSE);
+  put_arg ("/packc", FALSE, FALSE);
 
   /* Add the /INFORMATION option if the -i option was given.  This is
@@ -712 +728 @@
 
   if (opt_i)
-    put_arg ("/i", FALSE);
+    put_arg ("/i", FALSE, FALSE);
 
   /* Add the /DEBUG option if the -s option was not given.  Without
@@ -718 +734 @@
 
   if (!strip_symbols)
-    put_arg ("/de", FALSE);
+    put_arg ("/de", FALSE, FALSE);
 
   /* Add the /BASE:n option to set the base address.  This specifies
@@ -747 +763 @@
     {
       sprintf (tmp, "/bas:%s", base);
-      put_arg (tmp, FALSE);
+      put_arg (tmp, FALSE, FALSE);
     }
 
@@ -755 +771 @@
     {
       sprintf (tmp, "/st:0x%lx", stack_size * 1024);
-      put_arg (tmp, FALSE);
+      put_arg (tmp, FALSE, FALSE);
     }
 
@@ -765 +781 @@
 
   put_args (obj_fnames, TRUE);
-  put_arg (",", FALSE);
+  put_arg (",", FALSE, FALSE);
 
   /* Put the output file name onto the command line. */
 
-  put_arg (output_fname, TRUE);
-  put_arg (",", FALSE);
+  put_arg (output_fname, TRUE, TRUE);
+  put_arg (",", FALSE, FALSE);
 
   /* Put the map file name onto the command line. */
 
-  put_arg (map_fname, TRUE);
-  put_arg (",", FALSE);
+  put_arg (map_fname, TRUE, TRUE);
+  put_arg (",", FALSE, FALSE);
 
   /* Put the library file names onto the command line. */
 
   put_args (lib_fnames, TRUE);
-  put_arg (",", FALSE);
+  put_arg (",", FALSE, FALSE);
 
   /* Put the name of the module definition file onto the command line. */
 
-  put_arg (def_fname, TRUE);
-  put_arg (";", FALSE);
+  put_arg (def_fname, TRUE, TRUE);
+  put_arg (";", FALSE, FALSE);
   arg_end ();
 
@@ -811 +827 @@
     {
       arg_init (TRUE);
-      put_arg ("rc -n", TRUE);
-      put_arg (res_fname, TRUE);
-      put_arg (output_fname, TRUE);
+      put_arg ("rc", TRUE, FALSE);
+      put_arg ("-n", FALSE, FALSE);
+      put_arg (res_fname, TRUE, TRUE);
+      put_arg (output_fname, TRUE, TRUE);
       arg_end ();
       rc = system (command_line);