*
* Copyright (C) 1987 by the Massachusetts Institute of Technology
*
- * $Log$
- * Revision 1.1 1987-06-02 20:07:32 wesommer
- * Initial revision
- *
*/
#ifndef lint
static char *rcsid_sms_util_c = "$Header$";
#endif lint
-#include "sms_private.h"
#include "sms_server.h"
-#include <sys/uio.h>
#include <ctype.h>
-#ifdef notdef
-frequote(f, cp)
- FILE *f;
+#include <strings.h>
+#include <sys/types.h>
+
+extern char *whoami;
+
+char *
+requote(buf, cp, len)
+ char *buf;
register char *cp;
{
- register char c;
- putc('"', f);
- for( ; c= *cp; *cp++){
- if (c == '\\' || c == '"') putc('\\', f);
- if (isprint(c)) putc(c, f);
- else fprintf(f, "\\%03o", c);
+ register int count = 0;
+ register unsigned char c;
+ if (len <= 2) return buf;
+ *buf++ = '"'; count++; len--;
+ for(; (count < 40) && (len > 1) && (c = *cp);
+ cp++, --len, ++count) {
+ if (c == '\\' || c == '"') *buf++ = '\\';
+ if (isprint(c)) *buf++ = c;
+ else {
+ sprintf(buf, "\\%03o", c);
+ buf = index(buf, '\0');
+ }
+ }
+ if (len > 1) { *buf++ = '"'; count++; len--; }
+ if (len > 3 && count >= 40) {
+ *buf++ = '.'; count++; len--;
+ *buf++ = '.'; count++; len--;
+ *buf++ = '.'; count++; len--;
}
- putc('"', f);
+ if (len > 1) *buf = '\0';
+ return buf;
}
-#endif notdef
-void sms_com_err(whoami, code, message)
+log_args(tag, version, argc, argv)
+ char *tag;
+ int version;
+ int argc;
+ char **argv;
+{
+ char buf[BUFSIZ];
+ register int i;
+ register char *bp;
+
+ i = strlen(tag);
+ 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++ = ',';
+ *bp++ = ' ';
+ }
+ bp = requote(bp, argv[i], (buf - bp) + 1024);
+ }
+ *bp = '\0';
+ com_err(whoami, 0, "%s", buf);
+}
+
+void sms_com_err(whoami, code, fmt, pvar)
char *whoami;
int code;
- char *message;
+ char *fmt;
+ caddr_t pvar;
{
extern char *error_message();
extern client *cur_client;
- struct iovec strings[7];
- char buf[32];
- if (cur_client)
- (void) sprintf(buf, "[#%d]", cur_client->id);
- else buf[0]='\0';
-
- strings[1].iov_base = buf;
- strings[1].iov_len = strlen(buf);
-
- strings[0].iov_base = whoami;
if (whoami) {
- strings[0].iov_len = strlen(whoami);
- strings[2].iov_base = ": ";
- strings[2].iov_len = 2;
- } else {
- strings[0].iov_len = 0;
- strings[2].iov_base = " ";
- strings[2].iov_len = 1;
+ fputs(whoami, stderr);
+ if (cur_client) fprintf(stderr, "[#%d]", cur_client->id);
+ fputs(": ", stderr);
}
if (code) {
- register char *errmsg = error_message(code);
- strings[3].iov_base = errmsg;
- strings[3].iov_len = strlen(errmsg);
- strings[4].iov_base = " ";
- strings[4].iov_len = 1;
- } else {
- strings[3].iov_len = 0;
- strings[4].iov_len = 0;
+ fputs(error_message(code), stderr);
+ }
+ if (fmt) {
+ _doprnt(fmt, pvar, stderr);
}
- strings[5].iov_base = message;
- strings[5].iov_len = strlen(message);
- strings[6].iov_base = "\n";
- strings[6].iov_len = 1;
- (void) writev(2, strings, 7);
+ 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;
+ }
}