Annotation of src/usr.bin/cvs/log.c, Revision 1.44
1.44 ! joris 1: /* $OpenBSD: log.c,v 1.43 2008/04/24 19:13:56 tobias Exp $ */
1.1 jfb 2: /*
1.35 joris 3: * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
1.2 jfb 4: * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
1.1 jfb 5: * All rights reserved.
6: *
7: * Redistribution and use in source and binary forms, with or without
8: * modification, are permitted provided that the following conditions
9: * are met:
10: *
11: * 1. Redistributions of source code must retain the above copyright
12: * notice, this list of conditions and the following disclaimer.
13: * 2. The name of the author may not be used to endorse or promote products
14: * derived from this software without specific prior written permission.
15: *
16: * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
17: * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
18: * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
19: * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
20: * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21: * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22: * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23: * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24: * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25: * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26: */
27:
1.38 otto 28: #include <errno.h>
29: #include <string.h>
1.1 jfb 30:
1.16 xsa 31: #include "cvs.h"
1.1 jfb 32:
33: extern char *__progname;
1.19 joris 34: static int send_m = 1;
1.1 jfb 35:
36: /*
37: * cvs_log()
38: *
39: * Log the format-string message
40: * The <fmt> argument should not have a terminating newline, as this is taken
41: * care of by the logging facility.
42: */
1.34 xsa 43: void
1.1 jfb 44: cvs_log(u_int level, const char *fmt, ...)
45: {
46: va_list vap;
47:
48: va_start(vap, fmt);
1.34 xsa 49: cvs_vlog(level, fmt, vap);
1.1 jfb 50: va_end(vap);
51: }
52:
53: /*
54: * cvs_vlog()
55: *
56: * The <fmt> argument should not have a terminating newline, as this is taken
57: * care of by the logging facility.
58: */
1.34 xsa 59: void
1.1 jfb 60: cvs_vlog(u_int level, const char *fmt, va_list vap)
61: {
62: int ecp;
63: FILE *out;
64:
1.35 joris 65: if (cvs_trace != 1 && level == LP_TRACE)
1.34 xsa 66: return;
1.1 jfb 67:
68: if (level == LP_ERRNO)
69: ecp = errno;
1.4 jfb 70: else
71: ecp = 0;
1.1 jfb 72:
1.35 joris 73: if (level == LP_NOTICE)
74: out = stdout;
75: else
76: out = stderr;
77:
1.36 joris 78: if (cvs_server_active) {
1.35 joris 79: if (out == stdout)
80: putc('M', out);
81: else {
1.1 jfb 82: out = stdout;
1.35 joris 83: putc('E', out);
1.3 jfb 84: }
1.1 jfb 85:
1.35 joris 86: putc(' ', out);
1.1 jfb 87: }
88:
1.39 xsa 89: /* The cvs program appends the command name to the program name */
90: if (level == LP_TRACE) {
91: if (cvs_server_active)
92: putc('S', out);
93: else
94: putc('C', out);
95: (void)fputs("-> ", out);
1.41 tobias 96: } else if (level != LP_RCS) {
1.39 xsa 97: (void)fputs(__progname, out);
1.42 tobias 98: putc(' ', out);
99: if (level == LP_ABORT)
100: (void)fprintf(out,
101: "[%s aborted]", cmdp->cmd_name);
102: else
103: (void)fputs(cmdp->cmd_name, out);
1.39 xsa 104: (void)fputs(": ", out);
105: }
106:
107: (void)vfprintf(out, fmt, vap);
108: if (level == LP_ERRNO) {
109: (void)fprintf(out, ": %s\n", strerror(ecp));
1.1 jfb 110:
1.39 xsa 111: /* preserve it just in case we changed it? */
1.1 jfb 112: errno = ecp;
1.39 xsa 113: } else
114: fputc('\n', out);
1.2 jfb 115: }
116:
117: /*
118: * cvs_printf()
119: *
1.14 jfb 120: * Wrapper function around printf() that prepends a 'M' command when
1.2 jfb 121: * the program is acting as server.
122: */
123: int
124: cvs_printf(const char *fmt, ...)
125: {
126: int ret;
1.14 jfb 127: char *nstr, *dp, *sp;
1.2 jfb 128: va_list vap;
129:
130: va_start(vap, fmt);
1.14 jfb 131:
1.44 ! joris 132: ret = vasprintf(&nstr, fmt, vap);
! 133: if (ret == -1)
! 134: fatal("cvs_printf: could not allocate memory");
! 135:
! 136: for (dp = nstr; *dp != '\0';) {
! 137: sp = strchr(dp, '\n');
! 138: if (sp == NULL)
! 139: for (sp = dp; *sp != '\0'; sp++)
! 140: ;
! 141:
! 142: if (cvs_server_active && send_m) {
! 143: send_m = 0;
! 144: putc('M', stdout);
! 145: putc(' ', stdout);
1.14 jfb 146: }
147:
1.44 ! joris 148: if (dp != nstr && dp != sp &&
! 149: !strncmp(dp, LOG_REVSEP, sp - dp))
! 150: putc('>', stdout);
! 151:
! 152: fwrite(dp, sizeof(char), (size_t)(sp - dp), stdout);
! 153:
! 154: if (*sp != '\n')
! 155: break;
! 156:
! 157: putc('\n', stdout);
! 158: send_m = 1;
! 159: dp = sp + 1;
! 160: }
! 161:
! 162: xfree(nstr);
1.2 jfb 163: va_end(vap);
1.44 ! joris 164:
1.2 jfb 165: return (ret);
1.19 joris 166: }
![[BACK]](/icons/back.gif){kind=icon}
Return to log.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs