include: update pathnames.h

* use /dev/rtc0 (/dev/rtc was for the 'old' driver)
* remove hwclock Award workaround and alpha cmos paths
* relocate _PATH_BTMP from hwclock to login-utils
* add a comment for _PATH_BTMP and fix other login-utils comments
* add a comment for proc/cpuinfo
* remove empty shutdown.c comment from 4d43977f

Review changes
* remove 'used in' comments
* white space fixes

Reviewed-by: Karel Zak <kzak@redhat.com>
Signed-off-by: J William Piggott <elseifthen@gmx.com>

diff --git a/include/pathnames.h b/include/pathnames.h
index de6abe63e602cb1bfa374430936bef0ed974325c..8af386457aceb93c5569684b22a9f144c35263ce 100644 (file)
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -7,7 +7,7 @@
 #define PATHNAMES_H
 
 #ifdef HAVE_PATHS_H
-#include <paths.h>
+# include <paths.h>
 #endif
 
 #ifndef __STDC__
@@ -41,45 +41,40 @@
 #define _PATH_NOLOGIN_TXT      "/etc/nologin.txt"
 
 #ifndef _PATH_MAILDIR
-#define        _PATH_MAILDIR           "/var/spool/mail"
+# define _PATH_MAILDIR         "/var/spool/mail"
 #endif
 #define        _PATH_MOTDFILE          "/etc/motd"
 #ifndef _PATH_NOLOGIN
-#define        _PATH_NOLOGIN           "/etc/nologin"
+# define _PATH_NOLOGIN         "/etc/nologin"
 #endif
 #define        _PATH_VAR_NOLOGIN       "/var/run/nologin"
 
 #ifndef _PATH_LOGIN
-#define _PATH_LOGIN            "/bin/login"
+# define _PATH_LOGIN           "/bin/login"
 #endif
 #define _PATH_SHUTDOWN         "/sbin/shutdown"
 
 #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"
 #define _PATH_TERMCOLORS_DIR   "/etc/" _PATH_TERMCOLORS_DIRNAME
 
-/* used in login-utils/shutdown.c */
-
-/* used in login-utils/setpwnam.h and login-utils/islocal.c */
+/* login paths */
 #define _PATH_PASSWD           "/etc/passwd"
-
-/* used in login-utils/newgrp and login-utils/setpwnam.h*/
 #define _PATH_GSHADOW          "/etc/gshadow"
-
-/* used in login-utils/setpwnam.h */
 #define _PATH_GROUP            "/etc/group"
 #define _PATH_SHADOW_PASSWD    "/etc/shadow"
 #define _PATH_SHELLS           "/etc/shells"
 
-/* used in term-utils/agetty.c */
+#ifndef _PATH_BTMP
+# define _PATH_BTMP            "/var/log/btmp"
+#endif
+
 #define _PATH_ISSUE            "/etc/issue"
 #define _PATH_OS_RELEASE_ETC   "/etc/os-release"
 #define _PATH_OS_RELEASE_USR   "/usr/lib/os-release"
-
 #define _PATH_NUMLOCK_ON       _PATH_LOCALSTATEDIR "/numlock-on"
-
 #define _PATH_LOGINDEFS                "/etc/login.defs"
 
-/* used in misc-utils/look.c */
+/* misc paths */
 #define _PATH_WORDS             "/usr/share/dict/words"
 #define _PATH_WORDS_ALT         "/usr/share/dict/web2"
 
@@ -154,15 +149,10 @@
 # define _PATH_ADJTIME         "/etc/adjtime"
 #endif
 
-#define _PATH_LASTDATE         "/var/lib/lastdate"
 #ifdef __ia64__
 # define _PATH_RTC_DEV         "/dev/efirtc"
 #else
-# define _PATH_RTC_DEV         "/dev/rtc"
-#endif
-
-#ifndef _PATH_BTMP
-#define _PATH_BTMP             "/var/log/btmp"
+# define _PATH_RTC_DEV         "/dev/rtc0"
 #endif
 
 /* raw paths*/
@@ -195,9 +185,7 @@
 /* ctrlaltdel paths */
 #define _PATH_PROC_CTRL_ALT_DEL        "/proc/sys/kernel/ctrl-alt-del"
 
-/* hwclock-cmos paths */
-#define _PATH_DEV_PORT         "/dev/port"
+/* lscpu paths */
 #define _PATH_PROC_CPUINFO     "/proc/cpuinfo"
 
 #endif /* PATHNAMES_H */
-