Changeset 2619 for trunk/texinfo/makeinfo

Timestamp:

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

Author:

bird

Message:

applied OS/2 patches (manually).

Location:

trunk/texinfo/makeinfo

Files:

• files.c (modified) (10 diffs)
• makeinfo.c (modified) (9 diffs)
• node.c (modified) (7 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.  */

trunk/texinfo/makeinfo/makeinfo.c

@@ -543 +543 @@
   int reading_from_stdin = 0;
 
+#ifdef __EMX__
+  _response (&argc, &argv);
+  _wildcard (&argc, &argv);
+  if (argc == 1 && isatty (STDIN_FILENO))
+    usage (0);
+#endif
+
 #ifdef HAVE_SETLOCALE
   /* Do not use LC_ALL, because LC_NUMERIC screws up the scanf parsing
@@ -658 +665 @@
             {
               macro_expansion_filename = optarg;
-              macro_expansion_output_stream
-                = strcmp (optarg, "-") == 0 ? stdout : fopen (optarg, "w");
+#if defined(__EMX__)
+              if (strcmp (optarg, "-") == 0)
+                {
+                  macro_expansion_output_stream = stdout;
+                  freopen(NULL, FOPEN_WBIN, stdout);
+                }
+              else
+                macro_expansion_output_stream = fopen (optarg, FOPEN_WBIN);
+#else
+              macro_expansion_output_stream =
+                  strcmp (optarg, "-") == 0 ? stdout : fopen (optarg, "w");
+#endif
               if (!macro_expansion_output_stream)
                 error (_("%s: could not open macro expansion output `%s'"),
@@ -999 +1016 @@
           sprintf (end_block, "\n%cend ", COMMAND_PREFIX);
           if (executing_string && strstr (string, end_block))
-            line_error (_("Multiline command %c%s used improperly"), 
+            line_error (_("Multiline command %c%s used improperly"),
                 COMMAND_PREFIX, command);
           else
@@ -1632 +1649 @@
         real_output_filename = xstrdup (real_output_filename);
 
-      output_stream = fopen (real_output_filename, "w");
+#if defined(__EMX__)
+     output_stream = fopen (real_output_filename, FOPEN_WBIN);
+#else
+     output_stream = fopen (real_output_filename, "w");
+#endif
     }
 
@@ -3341 +3362 @@
           add_word_args ("\"%s\"", fullname);
           add_html_elt (" alt=");
-          add_word_args ("\"%s\">", 
+          add_word_args ("\"%s\">",
               escape_string (*alt_arg ? text_expansion (alt_arg) : fullname));
 
@@ -3378 +3399 @@
           strcpy (txtname, name_arg);
           strcat (txtname, ".txt");
-          image_file = fopen (txtname, "r");
+          image_file = fopen (txtname, FOPEN_RTXT); /* bird: text */
           if (image_file == NULL)
             {
@@ -3384 +3405 @@
                                                include_files_path, &file_info);
               if (txtpath != NULL)
-                image_file = fopen (txtpath, "r");
+                image_file = fopen (txtpath, FOPEN_RTXT); /* bird: text */
             }
 
@@ -3441 +3462 @@
                   if (image_in_brackets)
                     add_char (']');
-                  
+
                   if (use_magic_cookie)
                     add_char ('"');
@@ -3682 +3703 @@
              expand to a context-sensitive macro (e.g. @xref) and produce
              spurious warnings */
-          input_text_offset++; 
+          input_text_offset++;
           execute_string ("%s", value);
           input_text_offset--;

trunk/texinfo/makeinfo/node.c

@@ -504 +504 @@
     char *optr = otem;
     int need_old = 0;
-    
+
     for (; *optr; optr++)
       {
@@ -513 +513 @@
           }
       }
-    
+
     if (need_old)
       {
@@ -974 +974 @@
 
       if (!splitting && no_headers)
-        { /* cross refs need a name="#anchor" even if not writing headers */ 
+        { /* cross refs need a name="#anchor" even if not writing headers */
           add_html_names (node);
         }
@@ -984 +984 @@
           add_word_args ("<p>%s\n", splitting ? "" : "<hr>");
 
-          /* In the split HTML case, the filename is wrong for the 
+          /* In the split HTML case, the filename is wrong for the
              old-style converted names, but we'll add them anyway, for
              consistency.  (And we need them in the normal (not
@@ -995 +995 @@
               add_word ((char *) _("Next:"));
               add_word ("&nbsp;");
-              
+
               add_word ("<a rel=\"next\" accesskey=\"n\" href=\"");
               add_anchor_name (tem, 1);
               tem = escape_string (tem);
               add_word_args ("\">%s</a>", tem);
-              
+        
               free (tem);
 
@@ -1880 +1880 @@
                   char *split_basename = filename_part (split_filename);
 
+#ifdef __EMX__
+                  fd = open (split_filename,
+                             O_WRONLY|O_TRUNC|O_CREAT|O_BINARY, 0666);
+#else
                   fd = open (split_filename, O_WRONLY|O_TRUNC|O_CREAT, 0666);
+#endif
                   if (fd < 0
                       || write (fd, the_header, header_size) != header_size
@@ -1918 +1923 @@
        original again.  We must use `output_stream', or
        write_tag_table_indirect () won't know where to place the output. */
+#ifdef __EMX__
+    output_stream = fopen (filename, FOPEN_WBIN);
+#else
     output_stream = fopen (filename, "w");
+#endif
     if (!output_stream)
       {