added version number to log_args; added trim routines

diff --git a/server/mr_util.c b/server/mr_util.c
index 6590666238dac14f19ee3bf8adbff54432cd0e42..76ffd4d326d7f9bb0f226355e66645868341d8c5 100644 (file)
--- a/server/mr_util.c
+++ b/server/mr_util.c
@@ -5,38 +5,6 @@
  *
  *     Copyright (C) 1987 by the Massachusetts Institute of Technology
  *
- *     $Log$
- *     Revision 1.10  1987-08-04 01:54:47  wesommer
- *     Changed messages.
- *
- * Revision 1.9  87/08/04  01:50:13  wesommer
- * Rearranged messages.
- * 
- * Revision 1.8  87/07/29  16:02:48  wesommer
- * Use unsigned char rather than char to prevent sign extension
- * problem.
- * 
- * Revision 1.7  87/07/14  00:39:47  wesommer
- * Changed interface to log_args.
- * 
- * Revision 1.6  87/07/06  16:09:07  wesommer
- * Only print ... if the string is too long..
- * 
- * Revision 1.5  87/06/30  20:05:52  wesommer
- * Added range checking.
- * 
- * Revision 1.4  87/06/21  16:42:19  wesommer
- * Performance work, rearrangement of include files.
- * 
- * Revision 1.3  87/06/04  01:35:28  wesommer
- * Added better logging routines.
- * 
- * Revision 1.2  87/06/03  16:08:07  wesommer
- * Fixes for lint.
- * 
- * Revision 1.1  87/06/02  20:07:32  wesommer
- * Initial revision
- * 
  */
 
 #ifndef lint
@@ -78,20 +46,19 @@ requote(buf, cp, len)
        return buf;
 }
 
-log_args(tag, argc, argv)
+log_args(tag, version, argc, argv)
        char *tag;
+       int version;
        int argc;
        char **argv;
 {
        char buf[BUFSIZ];
        register int i;
-       register char *bp = buf;
+       register char *bp;
        
        i = strlen(tag);
-       bcopy(tag, bp, i+1);
-       bp += i;
-       *bp++ =':';
-       *bp++ =' ';
+       sprintf(buf, "%s[%d]: ", tag, version);
+       for (bp = buf; *bp; bp++);
        
        for (i = 0; i < argc && ((buf - bp) + 1024) > 2; i++) {
                if (i != 0) {
@@ -113,8 +80,6 @@ void sms_com_err(whoami, code, fmt, pvar)
        extern char *error_message();
        extern client *cur_client;
        
-       struct iovec strings[7];
-
        if (whoami) {
                fputs(whoami, stderr);
                if (cur_client) fprintf(stderr, "[#%d]", cur_client->id);
@@ -128,3 +93,46 @@ void sms_com_err(whoami, code, fmt, pvar)
        }
        putc('\n', stderr);
 }
+
+
+/* sms_trim_args: passed an argument vector, it will trim any trailing
+ * spaces on the args by writing a null into the string.
+ */
+
+int sms_trim_args(argc, argv)
+int argc;
+char **argv;
+{
+    register char **arg;
+    register char *p, *lastch;
+
+    for (arg = argv; argc--; arg++) {
+       for (lastch = p = *arg; *p; p++)
+         if (!isspace(*p))
+           lastch = p;
+       if (p != lastch) {
+           if (isspace(*lastch))
+             *lastch = 0;
+           else
+             *(++lastch) = 0;
+       }
+    }
+    return(0);
+}
+
+
+trim(s)
+register char *s;
+{
+    register char *p;
+
+    for (p = s; *s; s++)
+      if (*s != ' ')
+       p = s;
+    if (p != s) {
+       if (*p == ' ')
+         *p = 0;
+       else
+         p[1] = 0;
+    }
+}