Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
return EXIT_FAILURE;
}
- log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+ log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();
umask(0022);
- if (!(f = setmntent("/etc/fstab", "r"))) {
+ f = setmntent("/etc/fstab", "r");
+ if (!f) {
log_error("Failed to open /etc/fstab: %m");
goto finish;
}
- if (!(pids = hashmap_new(trivial_hash_func, trivial_compare_func))) {
+ pids = hashmap_new(trivial_hash_func, trivial_compare_func);
+ if (!pids) {
log_error("Failed to allocate set");
goto finish;
}
log_debug("Remounting %s", me->mnt_dir);
- if ((pid = fork()) < 0) {
+ pid = fork();
+ if (pid < 0) {
log_error("Failed to fork: %m");
- ret = 1;
+ ret = EXIT_FAILURE;
continue;
}
/* Parent */
s = strdup(me->mnt_dir);
+ if (!s) {
+ log_error("Out of memory.");
+ ret = EXIT_FAILURE;
+ continue;
+ }
+
- if ((k = hashmap_put(pids, UINT_TO_PTR(pid), s)) < 0) {
+ k = hashmap_put(pids, UINT_TO_PTR(pid), s);
+ if (k < 0) {
log_error("Failed to add PID to set: %s", strerror(-k));
ret = EXIT_FAILURE;
continue;
break;
}
- if ((s = hashmap_remove(pids, UINT_TO_PTR(si.si_pid)))) {
+ s = hashmap_remove(pids, UINT_TO_PTR(si.si_pid));
+ if (s) {
if (!is_clean_exit(si.si_code, si.si_status)) {
if (si.si_code == CLD_EXITED)
log_error("/bin/mount for %s exited with exit status %i.", s, si.si_status);