Release 10.47.51

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@2276 9d0c8265-081b-0410-96cb-a4ca84ce46f8

7 files changed, 28 insertions, 17 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 2ad0dfe0..38564e98 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -137,7 +137,7 @@ pm_config.h: \
 	echo '#ifndef PM_CONFIG_H' >>$@
 	echo '#define PM_CONFIG_H' >>$@
 ifeq ($(INTTYPES_H)x,x)
-	echo '/* Don't need to #include any inttypes.h-type thing */
+	echo '/* Dont need to #include any inttypes.h-type thing */' >>$@
 else
   ifeq ($(INTTYPES_H),"inttypes_netpbm.h")
 	cat inttypes_netpbm.h >>$@
diff --git a/converter/other/cameratopam/foveon.c b/converter/other/cameratopam/foveon.c
index 0198940c..a8d62bee 100644
--- a/converter/other/cameratopam/foveon.c
+++ b/converter/other/cameratopam/foveon.c
@@ -482,7 +482,7 @@ foveon_interpolate(float coeff[3][4]) {
               foveon_avg (image[row*width]+c, dscr[1], cfilt) * 3
               - ddft[0][c][0] ) / 4 - ddft[0][c][1];
     }
-    memcpy (black, black+8, sizeof *black*8);
+    memcpy (black, black+8, sizeof (*black)*8);
     memcpy (black+height-11, black+height-22, 11*sizeof *black);
     memcpy (last, black, sizeof last);
 
diff --git a/doc/HISTORY b/doc/HISTORY
index 6c3f8cde..4097110c 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,24 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+14.09.07 BJH  Release 10.47.51
+
+              Fix incorrect option parsing when there are multiple common
+              options (e.g. -plain -quiet).  Always broken.  (Possibility of
+              specifying multiple common options that don't cause the program
+              to ignore every other option (like -version) was new in Netpbm
+              10.10 (October 2002).
+
+              cameratopam: fix buffer overflow.  Always present.  (cameratopam
+              was new in Netpbm 10.28 (June 2005)).
+
+              Build: fix build failure in an environment that does not have
+              __inline .  Introduced some time between Netpbm 10.26
+              (January 2005) and Netpbm 10.35 (August 2006).
+
+              Build: Fix failure to compile lib/libsystem.c because of
+              nonexistent signal classes on some systems.
+
 14.04.30 BJH  Release 10.47.50
 
               pamsharpness: put primary output on Standard Output instead of
diff --git a/lib/libpm.c b/lib/libpm.c
index 1089da3c..910d5666 100644
--- a/lib/libpm.c
+++ b/lib/libpm.c
@@ -679,7 +679,7 @@ pm_proginit(int * const argcP, const char * argv[]) {
     show_version = FALSE;
     show_help = FALSE;
     pm_plain_output = FALSE;
-    for (argn = 1; argn < *argcP; ++argn) {
+    for (argn = i = 1; argn < *argcP; ++argn) {
         if (pm_keymatch(argv[argn], "-quiet", 6) ||
             pm_keymatch(argv[argn], "--quiet", 7)) 
             showmessages = FALSE;
@@ -694,11 +694,9 @@ pm_proginit(int * const argcP, const char * argv[]) {
                  pm_keymatch(argv[argn], "--plain", 7))
             pm_plain_output = TRUE;
         else
-            continue;
-        for (i = argn + 1; i <= *argcP; ++i)
-            argv[i - 1] = argv[i];
-        --(*argcP);
+            argv[i++] = argv[argn];
     }
+    *argcP=i;
 
     pm_setMessage((unsigned int) showmessages, NULL);
 
diff --git a/lib/libsystem.c b/lib/libsystem.c
index 1f445844..92495fe5 100644
--- a/lib/libsystem.c
+++ b/lib/libsystem.c
@@ -263,8 +263,6 @@ signalName(unsigned int const signalClass) {
         return "SIGTTIN";
     case SIGTTOU: /* POSIX.1 */
         return "SIGTTOU";
-    case SIGURG:
-        return "SIGURG";
     case SIGXCPU:
         return "SIGXCPU";
     case SIGXFSZ:
@@ -273,10 +271,6 @@ signalName(unsigned int const signalClass) {
         return "SIGVTALRM";
     case SIGPROF:
         return "SIGPROF";
-    case SIGWINCH:
-        return "SIGWINCH";
-    case SIGIO:
-        return "SIGIO";
     case SIGSYS:
         return "SIGSYS";
     default:
@@ -285,7 +279,8 @@ signalName(unsigned int const signalClass) {
         /* There are various other signal classes on some systems, but
            not defined by POSIX and not on at least one system we
            know of for which someone wanted to compile Netpbm.  The
-           list includes: SIGPWR, SIGLOST, SIGINFO, SIGRTxx.
+           list includes: SIGPWR, SIGLOST, SIGINFO, SIGRTxx,
+           SIGURG, SIGWINCH, SIGIO.
         */
     }
 }
diff --git a/lib/ppm.h b/lib/ppm.h
index 0695295f..719189bf 100644
--- a/lib/ppm.h
+++ b/lib/ppm.h
@@ -249,7 +249,7 @@ struct hsv
 ppm_hsv_from_color(pixel  const color,
                    pixval const maxval);
 
-static __inline pixval
+static __inline__ pixval
 ppm_colorvalue(pixel const p) {
 /*----------------------------------------------------------------------------
   The color value (V is HSV) as a pixval
@@ -257,7 +257,7 @@ ppm_colorvalue(pixel const p) {
     return PPM_MAX(PPM_GETR(p), PPM_MAX(PPM_GETG(p), PPM_GETB(p)));
 }
 
-static __inline pixval
+static __inline__ pixval
 ppm_saturation(pixel const p,
                pixval const maxval) {
 /*----------------------------------------------------------------------------
diff --git a/version.mk b/version.mk
index 17cb3ccd..f8017125 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 47
-NETPBM_POINT_RELEASE = 50
+NETPBM_POINT_RELEASE = 51