Changeset 2619 for trunk/texinfo/makeinfo/files.c

Timestamp:

Mar 12, 2006, 6:02:46 PM (19 years ago)

Author:

bird

Message:

applied OS/2 patches (manually).

File:

• trunk/texinfo/makeinfo/files.c (modified) (10 diffs)

trunk/texinfo/makeinfo/files.c

@@ -202 +202 @@
 
   fullpath
-    = get_file_info_in_path (filename, use_path ? include_files_path : NULL, 
+    = get_file_info_in_path (filename, use_path ? include_files_path : NULL,
                              &fileinfo);
 
@@ -369 +369 @@
 }
 
+#if defined (__EMX__)
+/* Convert DOS slashes to UNIX slashes. */
+static char *slashify (char *filename)
+{
+  if (filename)
+    for (char *s = strchr (filename, '/'); s; s = strchr (s + 1, '/')
+      *s = '/';
+  return filename;
+}
+#endif
+
 /* Return just the simple part of the filename; i.e. the
    filename without the path information, or extensions.
@@ -375 +386 @@
 filename_part (char *filename)
 {
+#if defined (__EMX__)
+  char *basename = filename_non_directory (slashify (filename));
+#else
   char *basename = filename_non_directory (filename);
+#endif
 
 #ifdef REMOVE_OUTPUT_EXTENSIONS
@@ -394 +409 @@
   char *result = NULL;
   int i;
+#ifdef __EMX__
+  slashify (filename);
+#endif
 
   filename = expand_filename (filename, "");
@@ -414 +432 @@
   int initial_character;
   char *result;
+#ifdef __EMX__
+  slashify (filename);
+#endif
 
   /* No filename given? */
   if (!filename || !*filename)
     return xstrdup ("");
-  
+
   /* Already absolute? */
   if (IS_ABSOLUTE (filename) ||
@@ -443 +464 @@
       strcat (localdir, "/");
       strcat (localdir, filename);
+#ifdef __EMX__
+      slashify (localdir);
+#endif
       result = xstrdup (localdir);
       free (localdir);
@@ -505 +529 @@
 {
   int i;
+#ifdef __EMX__
+  slashify (filename);
+  slashify (input_name);
+#endif
 
   if (filename)
@@ -542 +570 @@
       /* Make it so that relative names work. */
       char *result;
-      
+
       i = strlen (input_name) - 1;
 
@@ -580 +608 @@
   char *lastdot, *p;
 
-#ifdef _PC_NAME_MAX
+#if defined (_PC_NAME_MAX) && !defined(__EMX__) /* bird: _PC_NAME_MAX => 14 on OS/2. FIXME!!! */
   maxlen = pathconf (fname, _PC_NAME_MAX);
   if (maxlen < 1)
@@ -657 +685 @@
       || FILENAME_CMP (current_output_filename, ALSO_NULL_DEVICE) == 0)
     return;
-    
+
   /* We need the HTML header in the output,
      to get a proper output_position.  */