Signed / unsigned fixes and function prototypes

[freeradius.git] / src / main / radwho.c

diff --git a/src/main/radwho.c b/src/main/radwho.c
index 9a9dce9..fec34c9 100644 (file)
--- a/src/main/radwho.c
+++ b/src/main/radwho.c
@@ -27,18 +27,17 @@
 #include <freeradius-devel/ident.h>
 RCSID("$Id$")
 
-#include <freeradius-devel/autoconf.h>
+#include <freeradius-devel/radiusd.h>
+#include <freeradius-devel/sysutmp.h>
+#include <freeradius-devel/radutmp.h>
 
-#include <stdlib.h>
-#include <string.h>
+#ifdef HAVE_PWD_H
 #include <pwd.h>
+#endif
+
 #include <sys/stat.h>
-#include <sys/utsname.h>
-#include <ctype.h>
 
-#include <freeradius-devel/sysutmp.h>
-#include <freeradius-devel/radutmp.h>
-#include <freeradius-devel/radiusd.h>
+#include <ctype.h>
 
 /*
  *     FIXME: put in header file.
@@ -50,13 +49,13 @@ RCSID("$Id$")
  *     Header above output and format.
  */
 static const char *hdr1 =
-"Login      Name              What  TTY  When      From      Location";
-static const char *rfmt1 = "%-10.10s %-17.17s %-5.5s %s%-3u %-9.9s %-9.9s %-.19s%s";
+"Login      Name              What  TTY  When      From            Location";
+static const char *rfmt1 = "%-10.10s %-17.17s %-5.5s %s%-3u %-9.9s %-15.15s %-.19s%s";
 static const char *rfmt1r = "%s,%s,%s,%s%u,%s,%s,%s%s";
 
 static const char *hdr2 =
-"Login      Port    What      When          From       Location";
-static const char *rfmt2 = "%-10.10s %s%-5u  %-6.6s %-13.13s %-10.10s %-.28s%s";
+"Login      Port    What      When          From            Location";
+static const char *rfmt2 = "%-10.10s %s%-5u  %-6.6s %-13.13s %-15.15s %-.28s%s";
 static const char *rfmt2r = "%s,%s%u,%s,%s,%s,%s%s";
 
 static const char *eol = "\n";
@@ -68,7 +67,7 @@ const char *progname = "radwho";
 const char *radlog_dir = NULL;
 const char *radutmp_file = NULL;
 
-const char *radius_dir = NULL;
+char *radius_dir = NULL;
 const char *radacct_dir = NULL;
 const char *radlib_dir = NULL;
 uint32_t myip = INADDR_ANY;
@@ -78,6 +77,14 @@ int log_stripped_names;
  *     Global, for log.c to use.
  */
 struct main_config_t mainconfig;
+char *request_log_file = NULL;
+char *debug_log_file = NULL;
+int radius_xlat(char *out, UNUSED int outlen, UNUSED const char *fmt,
+               UNUSED REQUEST *request, UNUSED RADIUS_ESCAPE_STRING func)
+{
+       *out = 0;
+       return 0;
+}
 
 struct radutmp_config_t {
   char *radutmp_fn;
@@ -113,7 +120,7 @@ static FILE *safe_popen(const char *cmd, const char *mode)
 
 /*
  *     Print a file from FINGER_DIR. If the file is executable,
- *     execute it instead. Return 0 if succesfull.
+ *     execute it instead. Return 0 if successful.
  */
 static int ffile(const char *arg)
 {
@@ -179,6 +186,7 @@ static void sys_finger(const char *l)
  */
 static char *fullname(char *username)
 {
+#ifdef HAVE_PWD_Hx
        struct passwd *pwd;
        char *s;
 
@@ -186,6 +194,8 @@ static char *fullname(char *username)
                if ((s = strchr(pwd->pw_gecos, ',')) != NULL) *s = 0;
                return pwd->pw_gecos;
        }
+#endif
+
        return username;
 }
 
@@ -220,10 +230,10 @@ static char *dotime(time_t t)
        char *s = ctime(&t);
 
        if (showname) {
-               strlcpy(s + 4, s + 11, 5);
+               strlcpy(s + 4, s + 11, 6);
                s[9] = 0;
        } else {
-               strlcpy(s + 4, s + 8, 8);
+               strlcpy(s + 4, s + 8, 9);
                s[12] = 0;
        }
 
@@ -388,7 +398,7 @@ int main(int argc, char **argv)
                printf("Acct-Delay-Time = 0\n");
                exit(0);        /* don't bother printing anything else */
        }
-       
+
        /*
         *      Initialize mainconfig
         */
@@ -501,10 +511,10 @@ int main(int argc, char **argv)
                if (nas_ip_address != INADDR_NONE) {
                        if (rt.nas_address != nas_ip_address) continue;
                }
-               
+
                memcpy(session_id, rt.session_id, sizeof(rt.session_id));
                session_id[sizeof(rt.session_id)] = 0;
-               
+
                if (!rawoutput && rt.nas_port > (showname ? 999 : 99999)) {
                        portind = ">";
                        portno = (showname ? 999 : 99999);
@@ -520,11 +530,11 @@ int main(int argc, char **argv)
                        memcpy(nasname, rt.login, sizeof(rt.login));
                        nasname[sizeof(rt.login)] = '\0';
 
-                       librad_safeprint(nasname, -1, buffer,
+                       fr_print_string(nasname, 0, buffer,
                                         sizeof(buffer));
                        printf("User-Name = \"%s\"\n", buffer);
 
-                       librad_safeprint(session_id, -1, buffer,
+                       fr_print_string(session_id, 0, buffer,
                                         sizeof(buffer));
                        printf("Acct-Session-Id = \"%s\"\n", buffer);
 
@@ -553,7 +563,7 @@ int main(int argc, char **argv)
                                       hostname(buffer, sizeof(buffer),
                                                rt.framed_address));
                        }
-                       
+
                        /*
                         *      Some sanity checks on the time
                         */
@@ -567,8 +577,8 @@ int main(int argc, char **argv)
                                memcpy(nasname, rt.caller_id,
                                       sizeof(rt.caller_id));
                                nasname[sizeof(rt.caller_id)] = '\0';
-                               
-                               librad_safeprint(nasname, -1, buffer,
+
+                               fr_print_string(nasname, 0, buffer,
                                                 sizeof(buffer));
                                printf("Calling-Station-Id = \"%s\"\n", buffer);
                        }