X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futmp-wtmp.c;h=4a3a3f4dd3bb5fd90e7f7285950ff6dc36c6d25e;hb=c9ccc19f9eb0599109094c57b7a2f668d708f0c1;hp=5ee3d22e71e43ea083c876b63d065e14cbfe10df;hpb=b92bea5d2a9481de69bb627a7b442a9f58fca43d;p=elogind.git

diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 5ee3d22e7..4a3a3f4dd 100644
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -190,7 +190,7 @@ int utmp_put_reboot(usec_t t) {
         return write_entry_both(&store);
 }
 
-static const char *sanitize_id(const char *id) {
+_pure_ static const char *sanitize_id(const char *id) {
         size_t l;
 
         assert(id);
@@ -216,7 +216,7 @@ int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line
         strncpy(store.ut_id, sanitize_id(id), sizeof(store.ut_id));
 
         if (line)
-                strncpy(store.ut_line, path_get_file_name(line), sizeof(store.ut_line));
+                strncpy(store.ut_line, basename(line), sizeof(store.ut_line));
 
         return write_entry_both(&store);
 }
@@ -287,7 +287,7 @@ int utmp_put_runlevel(int runlevel, int previous) {
 #define TIMEOUT_MSEC 50
 
 static int write_to_terminal(const char *tty, const char *message) {
-        int _cleanup_close_ fd = -1;
+        _cleanup_close_ int fd = -1;
         const char *p;
         size_t left;
         usec_t end;