fix bogus lazy allocation in ctermid and missing malloc failure check

[musl] / include / paths.h

diff --git a/include/paths.h b/include/paths.h
index 8021917..2284870 100644 (file)
--- a/include/paths.h
+++ b/include/paths.h
@@ -1,35 +1,26 @@
-#ifndef _PATHS_H_
-#define        _PATHS_H_
+#ifndef _PATHS_H
+#define _PATHS_H
 
 #define        _PATH_DEFPATH "/usr/local/bin:/bin:/usr/bin"
 #define        _PATH_STDPATH "/bin:/usr/bin:/sbin:/usr/sbin"
 
 #define        _PATH_BSHELL    "/bin/sh"
 #define        _PATH_CONSOLE   "/dev/console"
-#define        _PATH_CSHELL    "/bin/csh"
-#define        _PATH_DEVDB     "/var/run/dev.db"
 #define        _PATH_DEVNULL   "/dev/null"
-#define        _PATH_DRUM      "/dev/drum"
-#define        _PATH_GSHADOW   "/etc/gshadow"
 #define        _PATH_KLOG      "/proc/kmsg"
-#define        _PATH_KMEM      "/dev/kmem"
 #define        _PATH_LASTLOG   "/var/log/lastlog"
 #define        _PATH_MAILDIR   "/var/mail"
 #define        _PATH_MAN       "/usr/share/man"
-#define        _PATH_MEM       "/dev/mem"
 #define        _PATH_MNTTAB    "/etc/fstab"
 #define        _PATH_MOUNTED   "/etc/mtab"
 #define        _PATH_NOLOGIN   "/etc/nologin"
-#define        _PATH_PRESERVE  "/var/lib"
-#define        _PATH_RWHODIR   "/var/spool/rwho"
 #define        _PATH_SENDMAIL  "/usr/sbin/sendmail"
 #define        _PATH_SHADOW    "/etc/shadow"
 #define        _PATH_SHELLS    "/etc/shells"
 #define        _PATH_TTY       "/dev/tty"
-#define        _PATH_UNIX      "/boot/vmlinux"
-#define _PATH_UTMP     "/var/run/utmp"
+#define _PATH_UTMP     "/dev/null/utmp"
 #define        _PATH_VI        "/usr/bin/vi"
-#define _PATH_WTMP     "/var/log/wtmp"
+#define _PATH_WTMP     "/dev/null/wtmp"
 #define _PATH_LASTLOG   "/var/log/lastlog"
 
 #define        _PATH_DEV       "/dev/"