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] format_proc_swaps: ensure space between fields for clarity Date: Fri, 30 Apr 2021 19:05:58 +0000 (GMT) [thread overview] Message-ID: <20210430190558.6304C385802D@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=6914b40c146081f0c59a3666b1dcc2993ffa0402 commit 6914b40c146081f0c59a3666b1dcc2993ffa0402 Author: Brian Inglis <Brian.Inglis@SystematicSW.ab.ca> Date: Fri Apr 30 07:19:20 2021 -0600 format_proc_swaps: ensure space between fields for clarity page/swap space name >= 40 or size/used >= 8 leaves no space between fields; ensure a space after name and add extra tabs after size and used fields; output appears like Linux 5.8 after changes to mm/swapfile(swap_show); proc-swaps-space-before.log: ==> /proc/swaps <== Filename Type Size Used Priority /mnt/c/pagefile.sys file 11567748292920 0 /mnt/d/pagefile.sys file 12582912205960 0 proc-swaps-space-after.log: ==> /proc/swaps <== Filename Type Size Used Priority /mnt/c/pagefile.sys file 11567748 241024 0 /mnt/d/pagefile.sys file 12582912 182928 0 Diff: --- winsup/cygwin/fhandler_proc.cc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index 7cd0b3af0..eb4efb07d 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -1920,7 +1920,7 @@ format_proc_swaps (void *, char *&destbuf) } bufptr += __small_sprintf (bufptr, - "Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n"); + "Filename\t\t\t\tType\t\tSize\t\tUsed\t\tPriority\n"); if (spi && NT_SUCCESS (status)) { @@ -1932,8 +1932,17 @@ format_proc_swaps (void *, char *&destbuf) used = (unsigned long long) spp->TotalUsed * wincap.page_size (); cygwin_conv_path (CCP_WIN_W_TO_POSIX, spp->FileName.Buffer, filename, NT_MAX_PATH); - bufptr += sprintf (bufptr, "%-40s%-16s%-8llu%-8llu%-8d\n", - filename, "file", total >> 10, used >> 10, 0); + /* ensure space between fields for clarity */ + size_t tabo = strlen (filename) / 8; /* offset tabs to space name */ + bufptr += sprintf (bufptr, "%s%s%s\t\t%llu%s\t%llu%s\t%d\n", + filename, + tabo < 5 ? "\t\t\t\t\t" + tabo : " ", + "file", + total >> 10, + total < 10000000000 ? "\t" : "", + used >> 10, + used < 10000000000 ? "\t" : "", + 0); } while (spp->NextEntryOffset && (spp = (PSYSTEM_PAGEFILE_INFORMATION)
reply other threads:[~2021-04-30 19:05 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=20210430190558.6304C385802D@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).