Began removing $Id$ tags. This will be an ongoing process.

[citadel.git] / citadel / getutline.c

diff --git a/citadel/getutline.c b/citadel/getutline.c
index 0398b8ff6babee532b08c02c87bbc987ec949da8..7c6b78e2fb5608de02d39a53b21c90353ad475cc 100644 (file)
--- a/citadel/getutline.c
+++ b/citadel/getutline.c
@@ -1,22 +1,28 @@
 /*
  * getutline.c: not-quite-compatible replacement for getutline(3)
  * by nathan bryant, feb 1999
- *
- * $Id$
  */
 
 #include "sysdep.h"
 #ifdef HAVE_UTMP_H
 #include <stdio.h>
+#include <sys/types.h>
 #include <utmp.h>
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
+#include <string.h>
 
 struct utmp *getutline(struct utmp *ut)
 {
   static struct utmp retval;
   FILE *utmp;
 
+#ifdef UTMP_FILE
+  if ((utmp = fopen(UTMP_FILE, "rb")) == NULL)
+#else
   if ((utmp = fopen(_PATH_UTMP, "rb")) == NULL)
+#endif
     return NULL;
 
   do
@@ -25,7 +31,7 @@ struct utmp *getutline(struct utmp *ut)
        fclose(utmp);
        return NULL;
       }
-  while (ut->ut_line != retval.ut_line);
+  while (strcmp(ut->ut_line, retval.ut_line));
 
   fclose(utmp);
   return &retval;