Page MenuHomeFreeBSD
Files F164853717

D22160.id72788.diff
No OneTemporary
Actions

D22160.id72788.diff
View Options

Index: head/bin/ps/keyword.c
===================================================================
--- head/bin/ps/keyword.c
+++ head/bin/ps/keyword.c
@@ -254,7 +254,7 @@
i = len;
sep = "\n";
}
- xo_emit("{P:/%s}{l:key/%s}", sep, p);
+ xo_emit("{P:/%hs}{l:key/%hs}", sep, p);
sep = " ";
}
xo_emit("\n");
Index: head/bin/ps/print.c
===================================================================
--- head/bin/ps/print.c
+++ head/bin/ps/print.c
@@ -89,11 +89,11 @@
v = vent->var;
if (v->flag & LJUST) {
if (STAILQ_NEXT(vent, next_ve) == NULL) /* last one */
- xo_emit("{T:/%s}", vent->header);
+ xo_emit("{T:/%hs}", vent->header);
else
- xo_emit("{T:/%-*s}", v->width, vent->header);
+ xo_emit("{T:/%-*hs}", v->width, vent->header);
} else
- xo_emit("{T:/%*s}", v->width, vent->header);
+ xo_emit("{T:/%*hs}", v->width, vent->header);
if (STAILQ_NEXT(vent, next_ve) != NULL)
xo_emit("{P: }");
}
Index: head/bin/ps/ps.c
===================================================================
--- head/bin/ps/ps.c
+++ head/bin/ps/ps.c
@@ -192,6 +192,7 @@
char fmtbuf[_POSIX2_LINE_MAX];
(void) setlocale(LC_ALL, "");
+ xo_no_setlocale();
time(&now); /* Used by routines in print.c. */
/*
@@ -696,7 +697,7 @@
fwidthmin = (xo_get_style(NULL) != XO_STYLE_TEXT ||
(STAILQ_NEXT(vent, next_ve) == NULL &&
(vent->var->flag & LJUST))) ? 0 : vent->var->width;
- snprintf(fmtbuf, sizeof(fmtbuf), "{:%s/%%%s%d..%ds}",
+ snprintf(fmtbuf, sizeof(fmtbuf), "{:%s/%%%s%d..%dhs}",
vent->var->field ? vent->var->field : vent->var->name,
(vent->var->flag & LJUST) ? "-" : "",
fwidthmin, fwidthmax);

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 5, 8:11 AM (17 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35969462
Default Alt Text
D22160.id72788.diff (1 KB)

Event Timeline