Merged from emacs--devo--0

[gnu-emacs] / lib-src / hexl.c

diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index beb170613dda6cf705b7c3fd15ebe644a9e53e42..7cabdc95a6640d13614c47688a60028de34793fc 100644 (file)
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,11 +1,38 @@
+/* Convert files for Emacs Hexl mode.
+   Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
+
+This file is not considered part of GNU Emacs.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <ctype.h>
-#ifdef MSDOS
+#ifdef DOS_NT
 #include <fcntl.h>
 #if __DJGPP__ >= 2
 #include <io.h>
 #endif
 #endif
+#ifdef WINDOWSNT
+#include <io.h>
+#endif
 
 #define DEFAULT_GROUPING       0x01
 #define DEFAULT_BASE           16
@@ -47,7 +74,7 @@ main (argc, argv)
    ** <filename>       dump filename
    ** -                (as filename == stdin)
    */
-    
+
   while (*argv && *argv[0] == '-' && (*argv)[1])
     {
       /* A switch! */
@@ -136,8 +163,8 @@ main (argc, argv)
        {
          char buf[18];
 
-#ifdef MSDOS
-#if __DJGPP__ >= 2
+#ifdef DOS_NT
+#if (__DJGPP__ >= 2) || (defined WINDOWSNT)
           if (!isatty (fileno (stdout)))
            setmode (fileno (stdout), O_BINARY);
 #else
@@ -147,7 +174,7 @@ main (argc, argv)
 #endif
          for (;;)
            {
-             register int i, c, d;
+             register int i, c = 0, d;
 
 #define hexchar(x) (isdigit (x) ? x - '0' : x - 'a' + 10)
 
@@ -185,8 +212,8 @@ main (argc, argv)
        }
       else
        {
-#ifdef MSDOS
-#if __DJGPP__ >= 2
+#ifdef DOS_NT
+#if (__DJGPP__ >= 2) || (defined WINDOWSNT)
           if (!isatty (fileno (fp)))
            setmode (fileno (fp), O_BINARY);
 #else
@@ -199,7 +226,7 @@ main (argc, argv)
          string[17] = '\0';
          for (;;)
            {
-             register int i, c;
+             register int i, c = 0;
 
              for (i=0; i < 16; ++i)
                {
@@ -214,7 +241,7 @@ main (argc, argv)
                  else
                    {
                      if (!i)
-                       printf ("%08x: ", address);
+                       printf ("%08lx: ", address);
 
                      if (iso_flag)
                        string[i+1] =
@@ -244,12 +271,17 @@ main (argc, argv)
        fclose (fp);
 
     } while (*argv != NULL);
-  return 0;
+  return EXIT_SUCCESS;
 }
 
 void
 usage ()
 {
   fprintf (stderr, "usage: %s [-de] [-iso]\n", progname);
-  exit (1);
+  exit (EXIT_FAILURE);
 }
+
+/* arch-tag: 20e04fb7-926e-4e48-be86-64fe869ecdaa
+   (do not change this comment) */
+
+/* hexl.c ends here */