/[magellan-source]/trunk/mkinitrd-magellan/busybox/procps/ps.c

Diff of /trunk/mkinitrd-magellan/busybox/procps/ps.c

Parent Directory | Revision Log | View Patch Patch

-revision 1122 by niro,
Sun May 30 11:32:42 2010 UTC
+revision 1123 by niro,
Wed Aug 18 21:56:57 2010 UTC
 Line 49 
 struct globals {
  	unsigned long long seconds_since_boot;
  #endif
  	char default_o[sizeof(DEFAULT_O_STR)];
- };
+ } FIX_ALIASING;
  #define G (*(struct globals*)&bb_common_bufsiz1)
  #define out                (G.out               )
  #define out_cnt            (G.out_cnt           )
 Line 142 
 static unsigned get_kernel_HZ(void)
  	if (kernel_HZ == (unsigned)-1)
  		kernel_HZ = get_HZ_by_waiting();
- 	//if (open_read_close("/proc/uptime", buf, sizeof(buf) <= 0)
+ 	//if (open_read_close("/proc/uptime", buf, sizeof(buf)) <= 0)
  	//	bb_perror_msg_and_die("can't read %s", "/proc/uptime");
  	//buf[sizeof(buf)-1] = '\0';
  	///sscanf(buf, "%llu", &seconds_since_boot);
 Line 232 
 static void func_tty(char *buf, int size
  		snprintf(buf, size+1, "%u,%u", ps->tty_major, ps->tty_minor);
  }
  #if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS
  static void func_rgroup(char *buf, int size, const procps_status_t *ps)
-Line 250 
 static void func_nice(char *buf, int siz
+Line 249 
 static void func_nice(char *buf, int siz
  	sprintf(buf, "%*d", size, ps->niceness);
  }
- #endif /* FEATURE_PS_ADDITIONAL_COLUMNS */
+ #endif
  #if ENABLE_FEATURE_PS_TIME
  static void func_etime(char *buf, int size, const procps_status_t *ps)
  {
  	/* elapsed time [[dd-]hh:]mm:ss; here only mm:ss */
 Line 278 
 static void func_time(char *buf, int siz
  	mm /= 60;
  	snprintf(buf, size+1, "%3lu:%02u", mm, ss);
  }
  #endif
  #if ENABLE_SELINUX
-Line 337 
 static ps_out_t* new_out_t(void)
+Line 338 
 static ps_out_t* new_out_t(void)
  static const ps_out_t* find_out_spec(const char *name)
  {
  	unsigned i;
+ #if ENABLE_DESKTOP
+ 	char buf[ARRAY_SIZE(out_spec)*7 + 1];
+ 	char *p = buf;
+ #endif
  	for (i = 0; i < ARRAY_SIZE(out_spec); i++) {
- 		if (!strncmp(name, out_spec[i].name6, 6))
+ 		if (strncmp(name, out_spec[i].name6, 6) == 0)
  			return &out_spec[i];
+ #if ENABLE_DESKTOP
+ 		p += sprintf(p, "%.6s,", out_spec[i].name6);
+ #endif
  	}
- 	bb_error_msg_and_die("bad -o argument '%s'", name);
+ #if ENABLE_DESKTOP
+ 	p[-1] = '\0';
+ 	bb_error_msg_and_die("bad -o argument '%s', supported arguments: %s", name, buf);
+ #else
+ 	bb_error_msg_and_die("bad -o argument '%s'");
+ #endif
  }
  static void parse_o(char* opt)
-Line 539 
 int ps_main(int argc, char **argv) MAIN_
+Line 553 
 int ps_main(int argc, char **argv) MAIN_
  int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
  {
  	procps_status_t *p;
- 	int len;
  	int psscan_flags = PSSCAN_PID | PSSCAN_UIDGID
  			| PSSCAN_STATE | PSSCAN_VSZ | PSSCAN_COMM;
- #if !ENABLE_FEATURE_PS_WIDE
+ 	unsigned terminal_width IF_NOT_FEATURE_PS_WIDE(= 79);
- 	enum { terminal_width = 79 };
+ 	enum {
- #else
+ 		OPT_Z = (1 << 0) * ENABLE_SELINUX,
- 	unsigned terminal_width;
+ 		OPT_T = (1 << ENABLE_SELINUX) * ENABLE_FEATURE_SHOW_THREADS,
- #endif
+ 	};
+ 	int opts = 0;
- #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
+ 	/* If we support any options, parse argv */
- 	int opts;
+ #if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE
  # if ENABLE_FEATURE_PS_WIDE
+ 	/* -w is a bit complicated */
  	int w_count = 0;
  	opt_complementary = "-:ww";
  	opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")"w", &w_count);
-Line 565 
 int ps_main(int argc UNUSED_PARAM, char
+Line 579 
 int ps_main(int argc UNUSED_PARAM, char
  		if (--terminal_width > MAX_WIDTH)
  			terminal_width = MAX_WIDTH;
  	}
- # else /* only ENABLE_SELINUX */
+ # else
- 	opts = getopt32(argv, "Z"IF_FEATURE_SHOW_THREADS("T"));
+ 	/* -w is not supported, only -Z and/or -T */
+ 	opt_complementary = "-";
+ 	opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T"));
  # endif
- # if ENABLE_SELINUX
+ #endif
- 	if ((opts & 1) && is_selinux_enabled())
+ #if ENABLE_SELINUX
+ 	if ((opts & OPT_Z) && is_selinux_enabled()) {
  		psscan_flags = PSSCAN_PID | PSSCAN_CONTEXT
  				| PSSCAN_STATE | PSSCAN_COMM;
- # endif
- # if ENABLE_FEATURE_SHOW_THREADS
- 	if (opts & (1 << ENABLE_SELINUX))
- 		psscan_flags |= PSSCAN_TASKS;
- # endif
- #endif /* ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX */
- 	if (psscan_flags & PSSCAN_CONTEXT)
  		puts("  PID CONTEXT                          STAT COMMAND");
- 	else
+ 	} else
+ #endif
+ 	{
  		puts("  PID USER       VSZ STAT COMMAND");
+ 	}
+ 	if (opts & OPT_T) {
+ 		psscan_flags |= PSSCAN_TASKS;
+ 	}
  	p = NULL;
  	while ((p = procps_scan(p, psscan_flags)) != NULL) {
+ 		int len;
  #if ENABLE_SELINUX
  		if (psscan_flags & PSSCAN_CONTEXT) {
  			len = printf("%5u %-32.32s %s  ",
-Line 621 
 int ps_main(int argc UNUSED_PARAM, char
+Line 638 
 int ps_main(int argc UNUSED_PARAM, char
  	return EXIT_SUCCESS;
  }
- #endif /* ENABLE_DESKTOP */
+ #endif /* !ENABLE_DESKTOP */

 Legend:



Removed from v.1122
 


changed lines


 
Added in v.1123
 Legend:



Removed from v.1122
 


changed lines


 
Added in v.1123
-Removed from v.1122
+Added in v.1123