Re: new puc card for adding
On 01/03/2013 12:33 PM, Gregory Edigarov wrote: diff --git a/sys/dev/pci/pucdata.c b/sys/dev/pci/pucdata.c index 3b87fb5..c5a0078 100644 --- a/sys/dev/pci/pucdata.c +++ b/sys/dev/pci/pucdata.c @@ -903,6 +903,15 @@ const struct puc_device_description puc_devs[] = { }, }, + /* SIIG JJ-E10011-S3 PCI-E card */ + { /* SIIG JJ-E10011-S3 PCI-E, */ + { PCI_VENDOR_OXFORD2, PCI_PRODUCT_OXFORD2_EXSYS_EX41092,0x,0x}, + { 0x, 0x, 0x,0x}, + { + { PUC_COM_MUL(10), 0x10, 0x }, + }, + }, + /* * Exsys EX-41098 */ Anybody? -- With best regards, Gregory Edigarov
PATCH: Print threads in top(1) output
Small nit that allows (immediately) differentiate processes and threads output of top(1). Adds another dependency on machine.h, though. :( Tested on both smart and dumb terminals. Any comments/okays? -- WBR, Vadim Zhukov Index: display.c === RCS file: /cvs/src/usr.bin/top/display.c,v retrieving revision 1.43 diff -u -p -r1.43 display.c --- display.c 5 Jun 2012 18:52:53 - 1.43 +++ display.c 7 Jan 2013 13:50:38 - @@ -100,6 +100,7 @@ int y_idlecursor; int y_procs; extern int ncpu; extern int combine_cpus; +extern struct process_select ps; int header_status = Yes; @@ -275,15 +276,18 @@ i_procstates(int total, int *brkdn) move(1, 0); clrtoeol(); - /* write current number of processes and remember the value */ - printwp(%d processes:, total); + /* write current number of procs and remember the value */ + if (ps.threads == Yes) + printwp(%d threads:, total); + else + printwp(%d processes:, total); if (smart_terminal) move(1, 15); else { /* put out enough spaces to get to column 15 */ i = digits(total); - while (i++ 4) { + while (i++ (ps.threads == Yes ? 6 : 4)) { if (putchar(' ') == EOF) exit(1); }
Re: PATCH: Print threads in top(1) output
On Mon, Jan 07, 2013 at 05:58:43PM +0400, Vadim Zhukov wrote: Small nit that allows (immediately) differentiate processes and threads output of top(1). Adds another dependency on machine.h, though. :( Tested on both smart and dumb terminals. Any comments/okays? -- WBR, Vadim Zhukov Index: display.c === RCS file: /cvs/src/usr.bin/top/display.c,v retrieving revision 1.43 diff -u -p -r1.43 display.c --- display.c 5 Jun 2012 18:52:53 - 1.43 +++ display.c 7 Jan 2013 13:50:38 - @@ -100,6 +100,7 @@ int y_idlecursor; int y_procs; extern int ncpu; extern int combine_cpus; +extern struct process_select ps; int header_status = Yes; @@ -275,15 +276,18 @@ i_procstates(int total, int *brkdn) move(1, 0); clrtoeol(); - /* write current number of processes and remember the value */ - printwp(%d processes:, total); + /* write current number of procs and remember the value */ + if (ps.threads == Yes) + printwp(%d threads:, total); + else + printwp(%d processes:, total); if (smart_terminal) move(1, 15); else { /* put out enough spaces to get to column 15 */ i = digits(total); - while (i++ 4) { + while (i++ (ps.threads == Yes ? 6 : 4)) { if (putchar(' ') == EOF) exit(1); } I like that. guenther, any objection ?
userdel vs /nonexistent
useradd treats /nonexistent specially whene creating the home dir. Should userdel also treat /nonexistent specially when deleting it? In particular, should nonexisting /nonexistent be an error? Jan Index: user.c === RCS file: /cvs/src/usr.sbin/user/user.c,v retrieving revision 1.92 diff -u -p -r1.92 user.c --- user.c 20 Sep 2012 11:32:06 - 1.92 +++ user.c 7 Jan 2013 20:37:49 - @@ -231,6 +231,10 @@ removehomedir(const char *user, uid_t ui } /* directory exists (and is a directory!) */ + if (strcmp(dir, _PATH_NONEXISTENT) == 0) { + warnx(Not trying to delete `%s', dir); + return 1; + } if (stat(dir, st) 0) { warnx(Home directory `%s' doesn't exist, dir); return 0;