* $Header$
*
* Copyright (C) 1987 by the Massachusetts Institute of Technology
- *
- * $Log$
- * Revision 1.9 1987-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
- *
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
*/
#ifndef lint
static char *rcsid_sms_util_c = "$Header$";
#endif lint
+#include <mit-copyright.h>
#include "sms_server.h"
#include <ctype.h>
#include <strings.h>
+#include <sys/types.h>
extern char *whoami;
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) {
bp = requote(bp, argv[i], (buf - bp) + 1024);
}
*bp = '\0';
- com_err(whoami, 0, buf);
+ com_err(whoami, 0, "%s", buf);
}
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);
}
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;
+ }
+}