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

Timestamp:

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

Author:

bird

Message:

applied OS/2 patches (manually).

File:

• trunk/texinfo/makeinfo/makeinfo.c (modified) (9 diffs)

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--;