public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: ps: avoid long lines on tty Date: Thu, 1 Feb 2024 16:20:35 +0000 (GMT) [thread overview] Message-ID: <20240201162035.BDDAC3870892@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=c414e1b97252789d2ab46c1b8fbe502a9ffca8b8 commit c414e1b97252789d2ab46c1b8fbe502a9ffca8b8 Author: Corinna Vinschen <corinna@vinschen.de> AuthorDate: Thu Feb 1 17:20:17 2024 +0100 Commit: Corinna Vinschen <corinna@vinschen.de> CommitDate: Thu Feb 1 17:20:17 2024 +0100 Cygwin: ps: avoid long lines on tty If stdout is a tty, restrict line output to tty width. Also, rename a weird buffer name. Diff: --- winsup/utils/ps.cc | 77 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 22 deletions(-) diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc index 2f7a72710a3a..b51608317c18 100644 --- a/winsup/utils/ps.cc +++ b/winsup/utils/ps.cc @@ -18,6 +18,7 @@ details. */ #include <pwd.h> #include <limits.h> #include <sys/cygwin.h> +#include <sys/ioctl.h> #include <cygwin/version.h> #include <ntdef.h> #include <ntdll.h> @@ -26,6 +27,8 @@ details. */ for that value. Note that PATH_MAX is only 4K. */ #define NT_MAX_PATH 32767 +#define OUTPUT_BUFSIZ 65536 + static char *prog_name; static struct option longopts[] = @@ -146,23 +149,34 @@ struct char pname[NT_MAX_PATH + sizeof (" <defunct>") + 1]; +char output_buffer[OUTPUT_BUFSIZ]; + +void +ps_print (const char *string, int width) +{ + printf ("%.*s\n", width, string); +} + int main (int argc, char *argv[]) { external_pinfo *p; - int aflag, lflag, fflag, sflag, proc_id; + int aflag, lflag, fflag, sflag, proc_id, width, col; uid_t uid; bool found_proc_id = true; cygwin_getinfo_types query = CW_GETPINFO; - const char *dtitle = " PID TTY STIME COMMAND\n"; - const char *dfmt = "%7d%4s%10s %s\n"; - const char *ftitle = " UID PID PPID TTY STIME COMMAND\n"; - const char *ffmt = "%8.8s%8d%8d%4s%10s %s\n"; - const char *ltitle = " PID PPID PGID WINPID TTY UID STIME COMMAND\n"; - const char *lfmt = "%c %7d %7d %7d %10u %4s %8u %8s %s\n"; + const char *stitle = " PID TTY STIME COMMAND"; + const char *sfmt = "%7d%4s%10s %s"; + const char *ftitle = " UID PID PPID TTY STIME COMMAND"; + const char *ffmt = "%8.8s%8d%8d%4s%10s %s"; + const char *ltitle = " PID PPID PGID WINPID TTY UID STIME COMMAND"; + const char *lfmt = "%c %7d %7d %7d %10u %4s %8u %8s %s"; char ch; void *drive_map = NULL; time_t boot_time = -1; + char *columns, *end; + struct winsize ws; + aflag = lflag = fflag = sflag = 0; uid = getuid (); @@ -231,13 +245,6 @@ main (int argc, char *argv[]) exit (1); } - if (sflag) - fputs (dtitle, stdout); - else if (fflag) - fputs (ftitle, stdout); - else if (lflag) - fputs (ltitle, stdout); - (void) cygwin_internal (CW_LOCK_PINFO, 1000); if (query == CW_GETPINFO_FULL) @@ -275,6 +282,26 @@ main (int argc, char *argv[]) boot_time = to_time_t ((FILETIME*)&stodi.BootTime); } + width = OUTPUT_BUFSIZ; + if ((columns = getenv ("COLUMNS")) && *columns + && (col = strtoul (columns, &end, 0)) > 0 && !*end) + width = col; + else if (isatty (STDOUT_FILENO)) + { + width = 80; + if (ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws) != -1) + width = ws.ws_col; + } + if (width > OUTPUT_BUFSIZ) + width = OUTPUT_BUFSIZ; + + if (sflag) + ps_print (stitle, width); + else if (fflag) + ps_print (ftitle, width); + else if (lflag) + ps_print (ltitle, width); + for (int pid = 0; (p = (external_pinfo *) cygwin_internal (query, pid | CW_NEXTPID)); pid = p->pid) @@ -388,19 +415,25 @@ main (int argc, char *argv[]) } if (sflag) - printf (dfmt, p->pid, ttynam (p->ctty, ttyname), start_time (p), pname); + { + snprintf (output_buffer, sizeof output_buffer, sfmt, + p->pid, ttynam (p->ctty, ttyname), start_time (p), pname); + } else if (fflag) { - printf (ffmt, uname, p->pid, p->ppid, ttynam (p->ctty, ttyname), - start_time (p), cmdline ?: pname); + snprintf (output_buffer, sizeof output_buffer, ffmt, + uname, p->pid, p->ppid, ttynam (p->ctty, ttyname), + start_time (p), cmdline ?: pname); free (cmdline); } else if (lflag) - printf (lfmt, status, p->pid, p->ppid, p->pgid, - p->dwProcessId, ttynam (p->ctty, ttyname), - p->version >= EXTERNAL_PINFO_VERSION_32_BIT ? p->uid32 : p->uid, - start_time (p), pname); - + snprintf (output_buffer, sizeof output_buffer, lfmt, + status, p->pid, p->ppid, p->pgid, + p->dwProcessId, ttynam (p->ctty, ttyname), + p->version >= EXTERNAL_PINFO_VERSION_32_BIT + ? p->uid32 : p->uid, + start_time (p), pname); + ps_print (output_buffer, width); } if (drive_map) cygwin_internal (CW_FREE_DRIVE_MAP, drive_map);
reply other threads:[~2024-02-01 16:20 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240201162035.BDDAC3870892@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).