#include "special.h"
#include "bus-util.h"
#include "bus-error.h"
-#include "bus-errors.h"
+#include "bus-common-errors.h"
#include "fileio.h"
#include "udev-util.h"
#include "path-util.h"
r = bus_open_system_systemd(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to get D-Bus connection: %m");
+ log_error_errno(r, "Failed to get D-Bus connection: %m");
return;
}
const char *device, *type;
bool root_directory;
int progress_pipe[2] = { -1, -1 };
- char dash_c[2+10+1];
+ char dash_c[sizeof("-C")-1 + DECIMAL_STR_MAX(int) + 1];
struct stat st;
if (argc > 2) {
q = parse_proc_cmdline(parse_proc_cmdline_item);
if (q < 0)
- log_warning_errno(-q, "Failed to parse kernel command line, ignoring: %m");
+ log_warning_errno(q, "Failed to parse kernel command line, ignoring: %m");
test_files();
root_directory = false;
if (stat(device, &st) < 0) {
- log_error("Failed to stat '%s': %m", device);
+ log_error_errno(errno, "Failed to stat '%s': %m", device);
return EXIT_FAILURE;
}
/* Find root device */
if (stat("/", &st) < 0) {
- log_error("Failed to stat() the root directory: %m");
+ log_error_errno(errno, "Failed to stat() the root directory: %m");
return EXIT_FAILURE;
}
log_info("fsck.%s doesn't exist, not checking file system on %s", type, device);
return EXIT_SUCCESS;
} else if (r < 0)
- log_warning_errno(-r, "fsck.%s cannot be used for %s: %m", type, device);
+ log_warning_errno(r, "fsck.%s cannot be used for %s: %m", type, device);
}
if (arg_show_progress)
if (pipe(progress_pipe) < 0) {
- log_error("pipe(): %m");
+ log_error_errno(errno, "pipe(): %m");
return EXIT_FAILURE;
}
cmdline[i++] = "-f";
if (progress_pipe[1] >= 0) {
- snprintf(dash_c, sizeof(dash_c), "-C%i", progress_pipe[1]);
- char_array_0(dash_c);
+ xsprintf(dash_c, "-C%i", progress_pipe[1]);
cmdline[i++] = dash_c;
}
pid = fork();
if (pid < 0) {
- log_error("fork(): %m");
+ log_error_errno(errno, "fork(): %m");
goto finish;
} else if (pid == 0) {
/* Child */
q = wait_for_terminate(pid, &status);
if (q < 0) {
- log_error_errno(-q, "waitid(): %m");
+ log_error_errno(q, "waitid(): %m");
goto finish;
}