Просмотр исходного кода

s-s-d: Preserve faulting errno when printing reason in fatal function

Guillem Jover лет назад: 17
Родитель
Сommit
f40d17f3b7
2 измененных файлов с 4 добавлено и 1 удалено
  1. 2 0
      debian/changelog
  2. 2 1
      utils/start-stop-daemon.c

+ 2 - 0
debian/changelog

@@ -90,6 +90,8 @@ dpkg (1.15.1) UNRELEASED; urgency=low
     Ubuntu vendor class to inherit from it.
   * Do not set the Arch substvar in dpkg-source, avoiding generating warnings
     when there's no compiler present. Closes: #526132
+  * Preserve faulting errno when printing reason in start-stop-daemon fatal
+    function.
 
   [ Frank Lichtenheld ]
   * Dpkg::Version: Remove unnecessary function next_elem which just

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

@@ -223,12 +223,13 @@ static void
 fatal(const char *format, ...)
 {
 	va_list arglist;
+	int errno_fatal = errno;
 
 	fprintf(stderr, "%s: ", progname);
 	va_start(arglist, format);
 	vfprintf(stderr, format, arglist);
 	va_end(arglist);
-	fprintf(stderr, " (%s)\n", strerror (errno));
+	fprintf(stderr, " (%s)\n", strerror(errno_fatal));
 	exit(2);
 }