From 3c0f6a19a271a7b85d62fc85d0ac1c6f661849f2 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Sat, 31 Oct 2015 13:01:37 -0700
Subject: Make ps -o error reporting intelligible.

I actually thought ps was segfaulting, and it wasn't until I was in gdb
that I even noticed there was an error message at all, and even then I
had to read the source to work out what it was trying to tell me.

Before:
  $ ps -o user,pid,ppid,vsize,rss,nice,wchan,addr,unknown,stat,cmd
  ps: -o 'user,pid,ppid,vsize,rss,nice,wchan,addr,unknown,stat,cmd'@41
  USER       PID  PPID    VSZ   RSS  NI WCHAN          ADDR$

After:
  $ ps -o user,pid,ppid,vsize,rss,nice,wchan,addr,unknown,stat,cmd
  ps: bad -o field 'user,pid,ppid,vsize,rss,nice,wchan,addr,unknown,stat,cmd'
                                                            ^
---
 toys/posix/ps.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/toys/posix/ps.c b/toys/posix/ps.c
index 1299ee42..d0975de0 100644
--- a/toys/posix/ps.c
+++ b/toys/posix/ps.c
@@ -126,6 +126,7 @@ GLOBALS(
   void *fields;
   long bits;
   long long ticks;
+  size_t header_len;
 )
 
 struct strawberry {
@@ -404,7 +405,9 @@ void comma_args(struct arg_list *al, char *err,
     arg = al->arg;
     while ((next = comma_iterate(&arg, &len)))
       if ((next = callback(next, len)))
-        perror_exit("%s '%s'@%ld", err, al->arg, 1+next-al->arg);
+        perror_exit("%s '%s'\n% *c", err, al->arg,
+                    strlen(toys.which->name) + 2 +
+                    strlen(err) + 2 + 1+next-al->arg, '^');
     al = al->next;
   }
 }
@@ -475,7 +478,9 @@ static char *parse_o(char *type, int length)
   dlist_add_nomalloc((void *)&TT.fields, (void *)field);
 
   // Print padded header.
-  printf(" %*s" + (field == TT.fields), field->len, field->title);
+  TT.header_len +=
+    snprintf(toybuf + TT.header_len, sizeof(toybuf) - TT.header_len,
+             " %*s" + (field == TT.fields), field->len, field->title);
   TT.bits |= (i = 1<<field->which);
 
   return 0;
@@ -596,13 +601,14 @@ void ps_main(void)
   TT.parsing = &TT.GG;
   comma_args(TT.G, "bad -G", parse_rest);
 
-  // Manual field selection, or default/-f/-l, plus -Z. Also prints header.
+  // Parse manual field selection, or default/-f/-l, plus -Z,
+  // constructing the header line in toybuf as we go.
   if (toys.optflags&FLAG_Z) {
     struct arg_list Z = { 0, "LABEL" };
 
     comma_args(&Z, "-Z", parse_o);
   }
-  if (TT.o) comma_args(TT.o, "-o", parse_o);
+  if (TT.o) comma_args(TT.o, "bad -o field", parse_o);
   else {
     struct arg_list al;
 
@@ -616,7 +622,7 @@ void ps_main(void)
     comma_args(&al, 0, parse_o);
   }
   dlist_terminate(TT.fields);
-  xputc('\n');
+  printf("%s\n", toybuf);
 
   dirtree_read("/proc", do_ps);
 
-- 
cgit v1.2.3