utils/start-stop-daemon.c: Fix OS-detection for sunos

utils/update-rc.d: Accept single-number values, since they are always in the [0,99] range

diff --git a/ChangeLog b/ChangeLog
index 328854868b3643bf5fe7047bcc8bee6e66885b71..7fd2caf454f9c7647a3e0aeb31602cd0a2e752f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec 16 15:20:11 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * utils/start-stop-daemon.c: Fix OS-detection for sunos
+  * utils/update-rc.d: Accept single-number values, since they are
+    always in the [0,99] range
+
 Wed Dec 15 16:08:47 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * autogen.sh: copy gettextm4, lcmessage.m4 and progtest.m4 to automake/

diff --git a/debian/changelog b/debian/changelog
index 1c0e3ac6a77f4d7e7c6b6c9c19a06b39f05a9463..11911caae9d0e9860e1870e12990d6deb0a1b8b0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ dpkg (1.6.4) unstable; urgency=low
     Closes: Bug#52580,#52185
   * Fix dselect program description, Closes: Bug#52328
   * Fix architecture-detection in dpkg-gencontrol, Closes: Bug#52616
+  * Accept single-number values in update-rc.d, Closes: Bug#46810
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/scripts/update-rc.d.pl b/scripts/update-rc.d.pl
index a26f9876026372c0b30bcbaab846f4d411e49c6d..8cad4044bda480d8c1d5470c9fae71832cb55832 100644 (file)
--- a/scripts/update-rc.d.pl
+++ b/scripts/update-rc.d.pl
@@ -124,7 +124,7 @@ sub defaults {
     $start = $stop = $ARGV[1] if ($#ARGV >= 1);
     $stop  =         $ARGV[2] if ($#ARGV >= 2);
     &usage ("codenumber must be a number between 0 and 99")
-       if ($start !~ /^\d\d$/ || $stop  !~ /^\d\d$/);
+       if ($start !~ /^\d\d?$/ || $stop  !~ /^\d\d?$/);
 
     $start = sprintf("%02d", $start);
     $stop  = sprintf("%02d", $stop);
@@ -149,7 +149,7 @@ sub startstop {
            &usage("expected start|stop");
        }
 
-       if ($ARGV[1] !~ /^\d\d$/) {
+       if ($ARGV[1] !~ /^\d\d?$/) {
            &usage("expected NN after $ARGV[0]");
        }
        $NN = sprintf("%02d", $ARGV[1]);

diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 9d49f98bf40188f0bd10f853e1d70f8a46c2a65d..dc5b487073b2f2282a340f100468821e99aa317d 100644 (file)
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -17,16 +17,14 @@
 
 #include "config.h"
 
-#ifdef linux
+#if defined(linux)
 #define OSLinux
-#endif
-
-#ifdef sunos
-#define OSsunos
-#endif
-
-#ifdef __GNU__
+#elif defined(__GNU__)
 #define OSHURD
+#elif defined(Sparc)
+#define OSsunos
+#else
+#error Unknown architecture - cannot build start-stop-daemon
 #endif
 
 #ifdef HAVE_HURH_H