summaryrefslogtreecommitdiff
path: root/Src/Modules/watch.c
diff options
context:
space:
mode:
Diffstat (limited to 'Src/Modules/watch.c')
-rw-r--r--Src/Modules/watch.c99
1 files changed, 59 insertions, 40 deletions
diff --git a/Src/Modules/watch.c b/Src/Modules/watch.c
index d45c3cf3d..acc499518 100644
--- a/Src/Modules/watch.c
+++ b/Src/Modules/watch.c
@@ -255,8 +255,10 @@ watchlog2(int inout, WATCH_STRUCT_UTMP *u, char *fmt, int prnt, int fini)
while (*fmt)
if (*fmt == '\\') {
if (*++fmt) {
- if (prnt)
+ if (prnt) {
+ applytextattributes(TSC_RAW);
putchar(*fmt);
+ }
++fmt;
} else if (fini)
return fmt;
@@ -266,8 +268,10 @@ watchlog2(int inout, WATCH_STRUCT_UTMP *u, char *fmt, int prnt, int fini)
else if (*fmt == fini)
return ++fmt;
else if (*fmt != '%') {
- if (prnt)
+ if (prnt) {
+ applytextattributes(TSC_RAW);
putchar(*fmt);
+ }
++fmt;
} else {
if (*++fmt == BEGIN3)
@@ -277,12 +281,15 @@ watchlog2(int inout, WATCH_STRUCT_UTMP *u, char *fmt, int prnt, int fini)
else
switch (*(fm2 = fmt++)) {
case 'n':
+ applytextattributes(TSC_RAW);
printf("%.*s", (int)sizeof(u->ut_name), u->ut_name);
break;
case 'a':
+ applytextattributes(TSC_RAW);
printf("%s", (!inout) ? "logged off" : "logged on");
break;
case 'l':
+ applytextattributes(TSC_RAW);
if (!strncmp(u->ut_line, "tty", 3))
printf("%.*s", (int)sizeof(u->ut_line) - 3, u->ut_line + 3);
else
@@ -290,6 +297,7 @@ watchlog2(int inout, WATCH_STRUCT_UTMP *u, char *fmt, int prnt, int fini)
break;
# ifdef WATCH_UTMP_UT_HOST
case 'm':
+ applytextattributes(TSC_RAW);
for (p = u->ut_host, i = sizeof(u->ut_host); i && *p; i--, p++) {
if (*p == '.' && !idigit(p[1]))
break;
@@ -297,6 +305,7 @@ watchlog2(int inout, WATCH_STRUCT_UTMP *u, char *fmt, int prnt, int fini)
}
break;
case 'M':
+ applytextattributes(TSC_RAW);
printf("%.*s", (int)sizeof(u->ut_host), u->ut_host);
break;
# endif /* WATCH_UTMP_UT_HOST */
@@ -343,9 +352,11 @@ watchlog2(int inout, WATCH_STRUCT_UTMP *u, char *fmt, int prnt, int fini)
len = ztrftime(buf, 40, fm2, tm, 0L);
if (len > 0)
metafy(buf, len, META_NOALLOC);
+ applytextattributes(TSC_RAW);
printf("%s", (*buf == ' ') ? buf + 1 : buf);
break;
case '%':
+ applytextattributes(TSC_RAW);
putchar('%');
break;
case 'F':
@@ -354,16 +365,20 @@ watchlog2(int inout, WATCH_STRUCT_UTMP *u, char *fmt, int prnt, int fini)
atr = match_colour((const char**)&fmt, 1, 0);
if (*fmt == '}')
fmt++;
- if (!(atr & (TXT_ERROR | TXTNOFGCOLOUR))) {
- txtunset(TXT_ATTR_FG_COL_MASK);
- txtset(atr & TXT_ATTR_FG_ON_MASK);
- set_colour_attribute(atr, COL_SEQ_FG, TSC_RAW);
+ if (atr && atr != TXT_ERROR) {
+ tsetattrs(atr);
+ break;
}
- }
- break;
+ } /* fall-through */
case 'f':
- txtunset(TXT_ATTR_FG_ON_MASK);
- set_colour_attribute(TXTNOFGCOLOUR, COL_SEQ_FG, TSC_RAW);
+ tunsetattrs(TXTFGCOLOUR);
+ break;
+ case 'H':
+ if (*fmt == '{') {
+ fmt = parsehighlight(fmt + 1, '}', &atr);
+ if (atr && atr != TXT_ERROR)
+ treplaceattrs(atr);
+ }
break;
case 'K':
if (*fmt == '{') {
@@ -371,49 +386,43 @@ watchlog2(int inout, WATCH_STRUCT_UTMP *u, char *fmt, int prnt, int fini)
atr = match_colour((const char**)&fmt, 0, 0);
if (*fmt == '}')
fmt++;
- if (!(atr & (TXT_ERROR | TXTNOBGCOLOUR))) {
- txtunset(TXT_ATTR_BG_COL_MASK);
- txtset(atr & TXT_ATTR_BG_ON_MASK);
- set_colour_attribute(atr, COL_SEQ_BG, TSC_RAW);
+ if (atr && atr != TXT_ERROR) {
+ tsetattrs(atr);
+ break;
}
- }
- break;
+ } /* fall-through */
case 'k':
- txtunset(TXT_ATTR_BG_ON_MASK);
- set_colour_attribute(TXTNOBGCOLOUR, COL_SEQ_BG, TSC_RAW);
+ tunsetattrs(TXTBGCOLOUR);
break;
case 'S':
- txtset(TXTSTANDOUT);
- tsetcap(TCSTANDOUTBEG, TSC_RAW);
+ tsetattrs(TXTSTANDOUT);
break;
case 's':
- txtunset(TXTSTANDOUT);
- tsetcap(TCSTANDOUTEND, TSC_RAW|TSC_DIRTY);
+ tunsetattrs(TXTSTANDOUT);
break;
case 'B':
- txtset(TXTBOLDFACE);
- tsetcap(TCBOLDFACEBEG, TSC_RAW|TSC_DIRTY);
+ tsetattrs(TXTBOLDFACE);
break;
case 'b':
- txtunset(TXTBOLDFACE);
- tsetcap(TCALLATTRSOFF, TSC_RAW|TSC_DIRTY);
+ tunsetattrs(TXTBOLDFACE);
break;
case 'U':
- txtset(TXTUNDERLINE);
- tsetcap(TCUNDERLINEBEG, TSC_RAW);
+ tsetattrs(TXTUNDERLINE);
break;
case 'u':
- txtunset(TXTUNDERLINE);
- tsetcap(TCUNDERLINEEND, TSC_RAW|TSC_DIRTY);
+ tunsetattrs(TXTUNDERLINE);
break;
default:
+ applytextattributes(TSC_RAW);
putchar('%');
putchar(*fm2);
break;
}
}
- if (prnt)
+ if (prnt) {
+ applytextattributes(TSC_RAW);
putchar('\n');
+ }
return fmt;
}
@@ -421,20 +430,23 @@ watchlog2(int inout, WATCH_STRUCT_UTMP *u, char *fmt, int prnt, int fini)
/* See if the watch entry matches */
static int
-watchlog_match(char *teststr, char *actual, int len)
+watchlog_match(char *teststr, char *actual, size_t buflen)
{
int ret = 0;
Patprog pprog;
char *str = dupstring(teststr);
+ size_t len = strnlen(actual, buflen);
+ char *user = metafy(actual, len,
+ len == buflen ? META_HEAPDUP : META_USEHEAP);
tokenize(str);
if ((pprog = patcompile(str, PAT_STATIC, 0))) {
queue_signals();
- if (pattry(pprog, actual))
+ if (pattry(pprog, user))
ret = 1;
unqueue_signals();
- } else if (!strncmp(actual, teststr, len))
+ } else if (!strcmp(user, teststr))
ret = 1;
return ret;
}
@@ -454,10 +466,17 @@ watchlog(int inout, WATCH_STRUCT_UTMP *u, char **w, char *fmt)
(void)watchlog2(inout, u, fmt, 1, 0);
return;
}
- if (*w && !strcmp(*w, "notme") &&
- strncmp(u->ut_name, get_username(), sizeof(u->ut_name))) {
- (void)watchlog2(inout, u, fmt, 1, 0);
- return;
+ if (*w && !strcmp(*w, "notme")) {
+ int len = strnlen(u->ut_name, sizeof(u->ut_name));
+ char *username = metafy(u->ut_name, len,
+ (len == sizeof(u->ut_name) ?
+ META_HEAPDUP /* allow for nul terminator */ :
+ META_USEHEAP));
+ if (strcmp(username, get_username())) {
+ (void)watchlog2(inout, u, fmt, 1, 0);
+ return;
+ }
+ w++;
}
for (; *w; w++) {
bad = 0;
@@ -486,7 +505,7 @@ watchlog(int inout, WATCH_STRUCT_UTMP *u, char **w, char *fmt)
for (vv = ++v; *vv && *vv != '%'; vv++);
sav = *vv;
*vv = '\0';
- if (!watchlog_match(v, u->ut_host, strlen(v)))
+ if (!watchlog_match(v, u->ut_host, sizeof(u->ut_host)))
bad = 1;
*vv = sav;
v = vv;
@@ -565,7 +584,7 @@ readwtab(WATCH_STRUCT_UTMP **head, int initial_sz)
if (sz)
qsort((void *) *head, sz, sizeof(WATCH_STRUCT_UTMP),
- (int (*) _((const void *, const void *)))ucmp);
+ (int (*) (const void *, const void *))ucmp);
return sz;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-08 02:56:25 +0000