Merge from trunk

[bpt/emacs.git] / lib-src / hexl.c

diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index cbab66a..89ea7d9 100644 (file)
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,11 +1,14 @@
 /* Convert files for Emacs Hexl mode.
 /* Convert files for Emacs Hexl mode.

-   Copyright (C) 1989 Free Software Foundation, Inc
+   Copyright (C) 1989, 2001-2011  Free Software Foundation, Inc.
+
+Author: Keith Gabryelski
+(according to authors.el)

 
 This file is not considered part of GNU Emacs.
 
 
 This file is not considered part of GNU Emacs.
 

-This program is free software; you can redistribute it and/or modify
+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
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation, either version 3 of the License, or

 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,


@@ -14,8 +17,8 @@ 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
 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+

 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>


@@ -45,12 +48,10 @@ int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1;
 int group_by = DEFAULT_GROUPING;
 char *progname;
 
 int group_by = DEFAULT_GROUPING;
 char *progname;
 

-void usage();
+void usage(void) NO_RETURN;

 
 int
 
 int

-main (argc, argv)
-     int argc;
-     char *argv[];
+main (int argc, char **argv)

 {
   register long address;
   char string[18];
 {
   register long address;
   char string[18];


@@ -173,11 +174,13 @@ main (argc, argv)
 #endif
          for (;;)
            {
 #endif
          for (;;)
            {

-             register int i, c, d;
+             register int i, c = 0, d;

 
 #define hexchar(x) (isdigit (x) ? x - '0' : x - 'a' + 10)
 
 
 #define hexchar(x) (isdigit (x) ? x - '0' : x - 'a' + 10)
 

-             fread (buf, 1, 10, fp); /* skip 10 bytes */
+             /* Skip 10 bytes.  */
+             if (fread (buf, 1, 10, fp) != 10)
+               break;

 
              for (i=0; i < 16; ++i)
                {
 
              for (i=0; i < 16; ++i)
                {


@@ -205,7 +208,9 @@ main (argc, argv)
                  if (i < 16)
                    break;
 
                  if (i < 16)
                    break;
 

-                 fread (buf, 1, 18, fp); /* skip 18 bytes */
+                 /* Skip 18 bytes.  */
+                 if (fread (buf, 1, 18, fp) != 18)
+                   break;

                }
            }
        }
                }
            }
        }


@@ -225,7 +230,7 @@ main (argc, argv)
          string[17] = '\0';
          for (;;)
            {
          string[17] = '\0';
          for (;;)
            {

-             register int i, c;
+             register int i, c = 0;

 
              for (i=0; i < 16; ++i)
                {
 
              for (i=0; i < 16; ++i)
                {


@@ -270,12 +275,15 @@ main (argc, argv)
        fclose (fp);
 
     } while (*argv != NULL);
        fclose (fp);
 
     } while (*argv != NULL);

-  return 0;
+  return EXIT_SUCCESS;

 }
 
 void
 }
 
 void

-usage ()
+usage (void)

 {
   fprintf (stderr, "usage: %s [-de] [-iso]\n", progname);
 {
   fprintf (stderr, "usage: %s [-de] [-iso]\n", progname);

-  exit (1);
+  exit (EXIT_FAILURE);

 }
 }

+
+
+/* hexl.c ends here */