Forráskód Böngészése

s-s-d: Only print fatal errno string if it was non-zero

Guillem Jover 17 éve
szülő
commit
384f6d131f
2 módosított fájl, 6 hozzáadás és 1 törlés
  1. 1 0
      debian/changelog
  2. 5 1
      utils/start-stop-daemon.c

+ 1 - 0
debian/changelog

@@ -92,6 +92,7 @@ dpkg (1.15.1) UNRELEASED; urgency=low
     when there's no compiler present. Closes: #526132
     when there's no compiler present. Closes: #526132
   * Preserve faulting errno when printing reason in start-stop-daemon fatal
   * Preserve faulting errno when printing reason in start-stop-daemon fatal
     function.
     function.
+  * Only print fatal errno string in start-stop-daemon if it was non-zero.
 
 
   [ Frank Lichtenheld ]
   [ Frank Lichtenheld ]
   * Dpkg::Version: Remove unnecessary function next_elem which just
   * Dpkg::Version: Remove unnecessary function next_elem which just

+ 5 - 1
utils/start-stop-daemon.c

@@ -229,7 +229,11 @@ fatal(const char *format, ...)
 	va_start(arglist, format);
 	va_start(arglist, format);
 	vfprintf(stderr, format, arglist);
 	vfprintf(stderr, format, arglist);
 	va_end(arglist);
 	va_end(arglist);
-	fprintf(stderr, " (%s)\n", strerror(errno_fatal));
+	if (errno_fatal)
+		fprintf(stderr, " (%s)\n", strerror(errno_fatal));
+	else
+		fprintf(stderr, "\n");
+
 	exit(2);
 	exit(2);
 }
 }