PERFORCE change 107478 for review
Kip Macy
kmacy at FreeBSD.org
Sat Oct 7 19:34:24 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=107478
Change 107478 by kmacy at kmacy_storage:sun4v_work_stable on 2006/10/08 02:32:30
IFC
Affected files ...
.. //depot/projects/kmacy_sun4v_stable/src/Makefile.inc1#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/bin/cp/cp.1#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/bin/cp/cp.c#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/bin/cp/utils.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/bin/sh/jobs.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/bin/sh/jobs.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/bin/sh/main.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/bin/sh/sh.1#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/config.h#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/etc/defaults/rc.conf#6 integrate
.. //depot/projects/kmacy_sun4v_stable/src/etc/mtree/BSD.include.dist#4 integrate
.. //depot/projects/kmacy_sun4v_stable/src/etc/network.subr#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/Makefile#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/auto_linklocal#1 branch
.. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/mixer#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/games/fortune/datfiles/fortunes#6 integrate
.. //depot/projects/kmacy_sun4v_stable/src/gnu/lib/libstdc++/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/include/Makefile#4 integrate
.. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/getobjformat.3#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/getenv.3#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/aio_return.2#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/lio_listio.2#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/lib/libthread_db/Makefile#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sbin/devd/devd.conf.5#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/Makefile#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/cache/Makefile#1 branch
.. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/cache/geom_cache.c#1 branch
.. //depot/projects/kmacy_sun4v_stable/src/sbin/mount_nfs/mount_nfs.8#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/secure/usr.bin/sftp/Makefile#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/doc/papers/Makefile#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man1/Makefile#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/aue.4#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/kue.4#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/sched_ule.4#4 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ural.4#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/uscanner.4#4 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man5/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man5/rc.conf.5#6 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/Makefile#7 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/kqueue.9#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/mk/sys.mk#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/timedef/da_DK.ISO8859-1.src#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/timedef/da_DK.UTF-8.src#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/boot/i386/btx/btx/btx.S#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/boot/i386/pxeldr/pxeboot.8#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/cam/scsi/scsi_da.c#4 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_proto.h#8 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/syscalls.master#8 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/conf/NOTES#6 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/conf/files#7 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/conf/options#7 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/fxp/if_fxp.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ips/ips.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ips/ipsreg.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_aue.c#4 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_cdce.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_kue.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_ural.c#7 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/umass.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usb_quirks.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/uscanner.c#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/geom/cache/g_cache.c#1 branch
.. //depot/projects/kmacy_sun4v_stable/src/sys/geom/cache/g_cache.h#1 branch
.. //depot/projects/kmacy_sun4v_stable/src/sys/i386/conf/GENERIC#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/conf/GENERIC#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_umtx.c#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/modules/geom/Makefile#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/modules/geom/geom_cache/Makefile#1 branch
.. //depot/projects/kmacy_sun4v_stable/src/sys/netinet/ip_carp.c#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/netinet/ip_fw2.c#6 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/pc98/conf/GENERIC#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/powerpc/conf/GENERIC#6 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/powerpc/powerpc/clock.c#4 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/sparc64/conf/GENERIC#5 integrate
.. //depot/projects/kmacy_sun4v_stable/src/usr.bin/calendar/calendars/calendar.australia#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/usr.sbin/Makefile#5 integrate
Differences ...
==== //depot/projects/kmacy_sun4v_stable/src/Makefile.inc1#5 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.561 2006/10/07 19:26:46 ru Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1012,56 +1012,58 @@
_startup_libs+= lib/csu/${MACHINE_ARCH}
.endif
-_prebuild_libs=
+_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
+ ${_kerberos5_lib_libroken} \
+ lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
+ ${_lib_libgssapi} ${_lib_libipx} \
+ lib/libkiconv lib/libkvm lib/libmd \
+ lib/libncurses lib/libopie lib/libpam \
+ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
+ ${_lib_libypclnt} lib/libz lib/msun \
+ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \
+ ${_secure_lib_libssl}
-_generic_libs= gnu/lib
-
-.if ${MK_IPX} != "no"
-_prebuild_libs+= lib/libipx
-.endif
-
-.if ${MK_KERBEROS} != "no"
-_prebuild_libs+= kerberos5/lib/libasn1
-_prebuild_libs+= kerberos5/lib/libkrb5
-_prebuild_libs+= kerberos5/lib/libroken
-_generic_libs+= kerberos5/lib
-.endif
-
-_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
- lib/libkiconv lib/libkvm lib/libmd \
- lib/libncurses lib/libnetgraph lib/libopie lib/libpam \
- lib/libradius \
- lib/libsbuf lib/libtacplus lib/libutil \
- lib/libz lib/msun lib/libgssapi
+_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
lib/libopie__L lib/libtacplus__L: lib/libmd__L
-_generic_libs+= lib
-
.if ${MK_CRYPT} != "no"
.if ${MK_OPENSSL} != "no"
-_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
+_secure_lib_libcrypto= secure/lib/libcrypto
+_secure_lib_libssl= secure/lib/libssl
lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
.if ${MK_OPENSSH} != "no"
-_prebuild_libs+= secure/lib/libssh
+_secure_lib_libssh= secure/lib/libssh
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
.if ${MK_KERBEROS} != "no"
-secure/lib/libssh__L: lib/libgssapi__L
+secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
+ kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \
+ kerberos5/lib/libroken__L
+.endif
.endif
.endif
+_secure_lib= secure/lib
.endif
-_generic_libs+= secure/lib
+
+.if ${MK_IPX} != "no"
+_lib_libipx= lib/libipx
.endif
-.if ${MK_OPENSSL} == "no"
-lib/libradius__L: lib/libmd__L
+.if ${MK_KERBEROS} != "no"
+_kerberos5_lib= kerberos5/lib
+_kerberos5_lib_libasn1= kerberos5/lib/libasn1
+_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
+_kerberos5_lib_libroken= kerberos5/lib/libroken
+_lib_libgssapi= lib/libgssapi
.endif
.if ${MK_NIS} != "no"
-_prebuild_libs+= lib/libypclnt
+_lib_libypclnt= lib/libypclnt
.endif
-_generic_libs+= usr.bin/lex/lib
+.if ${MK_OPENSSL} == "no"
+lib/libradius__L: lib/libmd__L
+.endif
.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
${_lib}__L: .PHONY
==== //depot/projects/kmacy_sun4v_stable/src/bin/cp/cp.1#3 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cp.1 8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/cp/cp.1,v 1.35 2006/08/25 09:58:13 ru Exp $
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.36 2006/10/07 22:14:43 trhodes Exp $
.\"
-.Dd August 24, 2006
+.Dd October 7, 2006
.Dt CP 1
.Os
.Sh NAME
@@ -252,8 +252,37 @@
.Fl r
option.
This implementation supports that option, however, its use is strongly
-discouraged, as it does not correctly copy special files, symbolic links
-or fifo's.
+discouraged as its behavior is very implementation dependent.
+In this version of
+.Nm ,
+.Fl r
+is just a synonym for
+.Fl RL .
+The
+.Fl R
+option gives the correct behavior while
+.Fl L
+preserves the sometimes-useful historical behavior of following symbolic links.
+The
+.Fl r
+option is deprecated in
+.Tn POSIX
+ and its behavior is likely to be different
+in future versions of
+.Nm
+and its behavior is likely to be different
+in future versions of
+.Fx .
+Previous versions of
+.Nm
+in
+.Fx ,
+the
+.Fl r
+behavior was to not correctly copy special files, symbolic links
+or fifos.
+Symbolic links were followed, and the contents of special
+files and fifos were copied to regular files.
.Pp
The
.Fl v
==== //depot/projects/kmacy_sun4v_stable/src/bin/cp/cp.c#5 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.55 2006/09/29 06:06:39 ru Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.56 2006/10/07 22:14:43 trhodes Exp $");
/*
* Cp copies source files to target files.
@@ -138,7 +138,8 @@
pflag = 1;
break;
case 'r':
- rflag = 1;
+ rflag = Lflag = 1;
+ Hflag = Pflag = 0;
break;
case 'v':
vflag = 1;
@@ -155,15 +156,12 @@
fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
if (rflag) {
- if (Rflag)
+ if (Rflag)
errx(1,
"the -R and -r options may not be specified together.");
- if (Hflag || Lflag || Pflag)
- errx(1,
- "the -H, -L, and -P options may not be specified with the -r option.");
- fts_options &= ~FTS_PHYSICAL;
- fts_options |= FTS_LOGICAL;
- }
+ }
+ if (rflag && !Hflag && !Pflag)
+ Rflag = 1;
if (Rflag) {
if (Hflag)
fts_options |= FTS_COMFOLLOW;
@@ -227,12 +225,12 @@
* the initial mkdir().
*/
if (r == -1) {
- if (rflag || (Rflag && (Lflag || Hflag)))
+ if (Rflag && (Lflag || Hflag))
stat(*argv, &tmp_stat);
else
lstat(*argv, &tmp_stat);
- if (S_ISDIR(tmp_stat.st_mode) && (Rflag || rflag))
+ if (S_ISDIR(tmp_stat.st_mode) && (Rflag))
type = DIR_TO_DNE;
else
type = FILE_TO_FILE;
@@ -420,7 +418,7 @@
}
break;
case S_IFDIR:
- if (!Rflag && !rflag) {
+ if (!Rflag) {
warnx("%s is a directory (not copied).",
curr->fts_path);
(void)fts_set(ftsp, curr, FTS_SKIP);
==== //depot/projects/kmacy_sun4v_stable/src/bin/cp/utils.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.49 2006/08/25 09:58:13 ru Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -54,17 +54,18 @@
#include <unistd.h>
#include "extern.h"
-#define cp_pct(x,y) (int)(100.0 * (double)(x) / (double)(y))
+
+#define cp_pct(x, y) ((y == 0) ? 0 : (int)(100.0 * (x) / (y)))
int
copy_file(const FTSENT *entp, int dne)
{
static char buf[MAXBSIZE];
struct stat *fs;
- int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0;
ssize_t wcount;
size_t wresid;
- size_t wtotal;
+ off_t wtotal;
+ int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0;
char *bufp;
#ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
char *p;
@@ -149,16 +150,17 @@
for (bufp = p, wresid = fs->st_size; ;
bufp += wcount, wresid -= (size_t)wcount) {
wcount = write(to_fd, bufp, wresid);
+ if (wcount <= 0)
+ break;
wtotal += wcount;
if (info) {
info = 0;
(void)fprintf(stderr,
- "%s -> %s %3d%%\n",
- entp->fts_path, to.p_path,
- cp_pct(wtotal, fs->st_size));
-
+ "%s -> %s %3d%%\n",
+ entp->fts_path, to.p_path,
+ cp_pct(wtotal, fs->st_size));
}
- if (wcount >= (ssize_t)wresid || wcount <= 0)
+ if (wcount >= (ssize_t)wresid)
break;
}
if (wcount != (ssize_t)wresid) {
@@ -179,16 +181,17 @@
for (bufp = buf, wresid = rcount; ;
bufp += wcount, wresid -= wcount) {
wcount = write(to_fd, bufp, wresid);
+ if (wcount <= 0)
+ break;
wtotal += wcount;
if (info) {
info = 0;
(void)fprintf(stderr,
- "%s -> %s %3d%%\n",
- entp->fts_path, to.p_path,
- cp_pct(wtotal, fs->st_size));
-
+ "%s -> %s %3d%%\n",
+ entp->fts_path, to.p_path,
+ cp_pct(wtotal, fs->st_size));
}
- if (wcount >= (ssize_t)wresid || wcount <= 0)
+ if (wcount >= (ssize_t)wresid)
break;
}
if (wcount != (ssize_t)wresid) {
==== //depot/projects/kmacy_sun4v_stable/src/bin/sh/jobs.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.71 2006/02/04 14:37:50 schweikh Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.72 2006/10/07 16:51:16 stefanf Exp $");
#include <fcntl.h>
#include <signal.h>
@@ -98,7 +98,7 @@
STATIC void deljob(struct job *);
STATIC struct job *getcurjob(struct job *);
#endif
-STATIC void showjob(struct job *, pid_t, int, int);
+STATIC void showjob(struct job *, pid_t, int);
/*
@@ -265,18 +265,21 @@
jobscmd(int argc, char *argv[])
{
char *id;
- int ch, sformat, lformat;
+ int ch, mode;
optind = optreset = 1;
opterr = 0;
- sformat = lformat = 0;
- while ((ch = getopt(argc, argv, "ls")) != -1) {
+ mode = SHOWJOBS_DEFAULT;
+ while ((ch = getopt(argc, argv, "lps")) != -1) {
switch (ch) {
case 'l':
- lformat = 1;
+ mode = SHOWJOBS_VERBOSE;
+ break;
+ case 'p':
+ mode = SHOWJOBS_PGIDS;
break;
case 's':
- sformat = 1;
+ mode = SHOWJOBS_PIDS;
break;
case '?':
default:
@@ -287,24 +290,25 @@
argv += optind;
if (argc == 0)
- showjobs(0, sformat, lformat);
+ showjobs(0, mode);
else
while ((id = *argv++) != NULL)
- showjob(getjob(id), 0, sformat, lformat);
+ showjob(getjob(id), 0, mode);
return (0);
}
STATIC void
-showjob(struct job *jp, pid_t pid, int sformat, int lformat)
+showjob(struct job *jp, pid_t pid, int mode)
{
char s[64];
struct procstat *ps;
struct job *j;
int col, curr, i, jobno, prev, procno;
+ pid_t ppid;
char c;
- procno = jp->nprocs;
+ procno = (mode == SHOWJOBS_PGIDS) ? 1 : jp->nprocs;
jobno = jp - jobtab + 1;
curr = prev = 0;
#if JOBS
@@ -315,11 +319,13 @@
}
#endif
for (ps = jp->ps ; ; ps++) { /* for each process */
- if (sformat) {
- out1fmt("%d\n", (int)ps->pid);
+ if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) {
+ ppid = (mode == SHOWJOBS_PIDS) ? ps->pid :
+ getpgid(ps->pid);
+ out1fmt("%d\n", (int)ppid);
goto skip;
}
- if (!lformat && ps != jp->ps && pid == 0)
+ if (mode != SHOWJOBS_VERBOSE && ps != jp->ps && pid == 0)
goto skip;
if (pid != 0 && pid != ps->pid)
goto skip;
@@ -335,7 +341,7 @@
fmtstr(s, 64, " %c ", c);
out1str(s);
col = strlen(s);
- if (lformat) {
+ if (mode == SHOWJOBS_VERBOSE) {
fmtstr(s, 64, "%d ", (int)ps->pid);
out1str(s);
col += strlen(s);
@@ -388,7 +394,7 @@
*/
void
-showjobs(int change, int sformat, int lformat)
+showjobs(int change, int mode)
{
int jobno;
struct job *jp;
@@ -404,7 +410,7 @@
}
if (change && ! jp->changed)
continue;
- showjob(jp, 0, sformat, lformat);
+ showjob(jp, 0, mode);
jp->changed = 0;
if (jp->state == JOBDONE) {
freejob(jp);
@@ -992,7 +998,7 @@
out1str(" (core dumped)");
out1c('\n');
} else
- showjob(thisjob, pid, 0, 0);
+ showjob(thisjob, pid, SHOWJOBS_DEFAULT);
}
} else {
TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job));
==== //depot/projects/kmacy_sun4v_stable/src/bin/sh/jobs.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)jobs.h 8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/jobs.h,v 1.18 2004/04/06 20:06:51 markm Exp $
+ * $FreeBSD: src/bin/sh/jobs.h,v 1.19 2006/10/07 16:51:16 stefanf Exp $
*/
/* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */
@@ -74,6 +74,13 @@
#endif
};
+enum {
+ SHOWJOBS_DEFAULT, /* job number, status, command */
+ SHOWJOBS_VERBOSE, /* job number, PID, status, command */
+ SHOWJOBS_PIDS, /* PID only */
+ SHOWJOBS_PGIDS /* PID of the group leader only */
+};
+
extern pid_t backgndpid; /* pid of last background process */
extern int job_warning; /* user was warned about stopped jobs */
extern int in_waitcmd; /* are we in waitcmd()? */
@@ -84,7 +91,7 @@
int fgcmd(int, char **);
int bgcmd(int, char **);
int jobscmd(int, char **);
-void showjobs(int, int, int);
+void showjobs(int, int);
int waitcmd(int, char **);
int jobidcmd(int, char **);
struct job *makejob(union node *, int);
==== //depot/projects/kmacy_sun4v_stable/src/bin/sh/main.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.28 2006/04/02 18:51:32 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.29 2006/10/07 16:51:16 stefanf Exp $");
#include <stdio.h>
#include <signal.h>
@@ -211,7 +211,7 @@
inter = 0;
if (iflag && top) {
inter++;
- showjobs(1, 0, 0);
+ showjobs(1, SHOWJOBS_DEFAULT);
chkmail(0);
flushout(&output);
}
==== //depot/projects/kmacy_sun4v_stable/src/bin/sh/sh.1#5 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.123 2006/09/17 17:40:07 ru Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.124 2006/10/07 16:51:16 stefanf Exp $
.\"
-.Dd July 29, 2006
+.Dd October 7, 2006
.Dt SH 1
.Os
.Sh NAME
@@ -1777,7 +1777,7 @@
If the
.Ar job
argument is omitted, use the current job.
-.It Ic jobs Oo Fl ls Oc Op Ar job ...
+.It Ic jobs Oo Fl lps Oc Op Ar job ...
Print information about the specified jobs, or all jobs if no
.Ar job
argument is given.
@@ -1787,8 +1787,13 @@
.Fl l
option is specified, the PID of each job is also printed.
If the
+.Fl p
+option is specified, only the process IDs for the process group leaders
+are printed, one per line.
+If the
.Fl s
-option is specified, only the PIDs of the jobs are printed, one per line.
+option is specified, only the PIDs of the job commands are printed, one per
+line.
.It Ic local Oo Ar variable ... Oc Op Fl
See the
.Sx Functions
==== //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/config.h#5 (text+ko) ====
@@ -1314,7 +1314,7 @@
/* #undef WORDS_BIGENDIAN */
/* Define if xauth is found in your path */
-#define XAUTH_PATH "/usr/X11R6/bin/xauth"
+/* #undef XAUTH_PATH */
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
==== //depot/projects/kmacy_sun4v_stable/src/etc/defaults/rc.conf#6 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.297 2006/09/29 15:45:09 bms Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.298 2006/10/06 23:22:12 flz Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -535,6 +535,7 @@
# ruleset file.
newsyslog_enable="YES" # Run newsyslog at startup.
newsyslog_flags="-CN" # Newsyslog flags to create marked files
+mixer_enable="YES" # Run the sound mixer.
##############################################################
### Jail Configuration #######################################
==== //depot/projects/kmacy_sun4v_stable/src/etc/mtree/BSD.include.dist#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.108 2006/09/07 18:24:24 emax Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.109 2006/10/06 08:27:07 ru Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -100,6 +100,8 @@
..
..
geom
+ cache
+ ..
concat
..
eli
==== //depot/projects/kmacy_sun4v_stable/src/etc/network.subr#5 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/network.subr,v 1.174 2006/10/02 10:13:29 gnn Exp $
+# $FreeBSD: src/etc/network.subr,v 1.175 2006/10/07 15:45:56 ume Exp $
#
#
@@ -41,10 +41,6 @@
{
_cfg=1
- if checkyesno ipv6_enable; then
- ${SYSCTL_W} net.inet6.ip6.auto_linklocal=1
- fi
-
ifconfig_args=`ifconfig_getargs $1`
if [ -n "${ifconfig_args}" ]; then
ifconfig $1 up
==== //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/Makefile#5 (text+ko) ====
@@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.76 2006/09/07 22:25:08 emax Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.77 2006/10/07 15:45:56 ume Exp $
.include <bsd.own.mk>
FILES= DAEMON LOGIN NETWORKING SERVERS \
abi accounting addswap adjkerntz amd \
- apm apmd archdep atm1 atm2 atm3 auditd \
+ apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \
bgfsck bluetooth bootparams bridge bsnmpd bthidd \
ccd cleanvar cleartmp cron \
devd devfs dhclient \
==== //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/mixer#2 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/mixer,v 1.6 2005/12/10 19:49:03 dougb Exp $
+# $FreeBSD: src/etc/rc.d/mixer,v 1.7 2006/10/06 23:22:13 flz Exp $
#
# PROVIDE: mixer
@@ -34,6 +34,7 @@
. /etc/rc.subr
name="mixer"
+rcvar="mixer_enable"
stop_cmd="mixer_stop"
start_cmd="mixer_start"
reload_cmd="mixer_start"
==== //depot/projects/kmacy_sun4v_stable/src/games/fortune/datfiles/fortunes#6 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.226 2006/09/17 21:36:16 phk Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.227 2006/10/07 08:29:20 phk Exp $
%
=======================================================================
@@ -5192,6 +5192,22 @@
\ \ /___\/ \ \ \
\____\/ \__\/
%
+ THE
+ NORMAL
+ LAW OF ERROR
+ STANDS OUT IN THE
+ EXPERIENCE OF MANKIND
+ AS ONE OF THE BROADEST
+ GENERALIZATIONS OF NATURAL
+ PHILOSOPHY * IT SERVES AS THE
+ GUIDING INSTRUMENT IN RESEARCHES
+ IN THE PHYSICAL AND SOCIAL SCIENCES AND
+ IN MEDICINE, AGRICULTURE AND ENGINEERING *
+ IT IS AN INDISPENSABLE TOOL FOR THE ANALYSIS AND THE
+INTERPRETATION OF THE BASIC DATA OBTAINED BY OBSERVATION AND EXPERIMENT
+
+ -- W. J. Youden
+%
***
*******
*********
==== //depot/projects/kmacy_sun4v_stable/src/gnu/lib/libstdc++/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.57 2006/09/30 12:52:15 ru Exp $
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.58 2006/10/05 20:55:37 obrien Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
SRCDIR= ${.CURDIR}/../../../contrib/libstdc++
@@ -12,6 +12,9 @@
SHLIB_MAJOR= 5
CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
+.if ${MACHINE_ARCH} == "arm"
+CFLAGS+= -D_GLIBCXX_SJLJ_EXCEPTIONS=1
+.endif
CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
CFLAGS+= -frandom-seed=RepeatabilityConsideredGood
CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \
==== //depot/projects/kmacy_sun4v_stable/src/include/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.263 2006/09/07 18:24:24 emax Exp $
+# $FreeBSD: src/include/Makefile,v 1.264 2006/10/06 08:27:06 ru Exp $
#
# Doing a "make install" builds /usr/include.
@@ -45,8 +45,8 @@
fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \
fs/unionfs \
- geom/concat geom/eli geom/gate geom/label geom/mirror geom/nop \
- geom/raid3 geom/shsec geom/stripe \
+ geom/cache geom/concat geom/eli geom/gate geom/label geom/mirror \
+ geom/nop geom/raid3 geom/shsec geom/stripe \
isofs/cd9660 \
netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
netgraph/atm netgraph/netflow \
==== //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/getobjformat.3#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/gen/getobjformat.3,v 1.10 2004/07/02 23:52:10 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/getobjformat.3,v 1.11 2006/10/07 21:27:20 trhodes Exp $
.\"
.Dd September 7, 1998
.Dt GETOBJFORMAT 3
@@ -116,7 +116,8 @@
If the environment variable
.Ev OBJFORMAT
is set, it overrides the default object file format.
-.Ev OBJFORMAT takes precedence over
+.Ev OBJFORMAT
+takes precedence over
.Pa /etc/objformat .
.El
.Sh FILES
==== //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/getenv.3#2 (text+ko) ====
@@ -34,7 +34,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)getenv.3 8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.17 2005/01/20 09:17:04 ru Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.18 2006/10/07 21:27:21 trhodes Exp $
.\"
.Dd December 11, 1993
.Dt GETENV 3
@@ -90,8 +90,7 @@
.Fa overwrite
is tested; if
.Fa overwrite
-is
-zero, the
+is zero, the
variable is not reset, otherwise it is reset
to the given
.Fa value .
==== //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/aio_return.2#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/aio_return.2,v 1.17 2003/01/13 10:37:11 tjr Exp $
+.\" $FreeBSD: src/lib/libc/sys/aio_return.2,v 1.19 2006/10/07 10:49:20 trhodes Exp $
.\"
-.Dd June 2, 1999
+.Dd October 7, 2006
.Dt AIO_RETURN 2
.Os
.Sh NAME
@@ -47,10 +47,10 @@
.Fn aio_return
system call
should only be called once, to obtain the final status of an asynchronous
-I/O operation once
-.Xr aio_error 2
+I/O operation once it has completed
+.Xr ( aio_error 2
returns something other than
-.Er EINPROGRESS .
+.Er EINPROGRESS ) .
.Sh RETURN VALUES
If the asynchronous I/O request has completed, the status is returned
as described in
@@ -58,12 +58,10 @@
.Xr write 2 ,
or
.Xr fsync 2 .
-On failure,
+Otherwise,
.Fn aio_return
-returns
-.Dv -1
-and sets
-.Dv errno
+returns \-1 and sets
+.Va errno
to indicate the error condition.
.Sh ERRORS
The
@@ -74,7 +72,7 @@
The
.Fa iocb
argument
-does not reference an outstanding asynchronous I/O request.
+does not reference a completed asynchronous I/O request.
.El
.Sh SEE ALSO
.Xr aio_cancel 2 ,
==== //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/lio_listio.2#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.5 2005/12/13 13:43:35 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.6 2006/10/07 05:13:32 trhodes Exp $
.\"
.Dd January 12, 2003
.Dt LIO_LISTIO 2
@@ -112,7 +112,7 @@
.Dv LIO_NOWAIT ,
the
.Fn lio_listio
-function 0 if the operations are successfully queued,
+function returns 0 if the operations are successfully queued,
otherwise \-1.
.Sh ERRORS
The
==== //depot/projects/kmacy_sun4v_stable/src/lib/libthread_db/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthread_db/Makefile,v 1.7 2006/03/29 14:08:45 deischen Exp $
+# $FreeBSD: src/lib/libthread_db/Makefile,v 1.8 2006/10/05 06:26:31 davidxu Exp $
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
@@ -6,7 +6,6 @@
SHLIB_MAJOR= 2
SRCS= thread_db.c
SRCS+= libpthread_db.c libpthread_md.c
-SRCS+= libc_r_db.c libc_r_md.c
SRCS+= libthr_db.c
INCS= thread_db.h
WARNS?= 1
==== //depot/projects/kmacy_sun4v_stable/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.977 2006/09/28 15:36:59 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.979 2006/10/08 00:22:20 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -218,6 +218,10 @@
security advisory
<ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:21.gzip.asc">FreeBSD-SA-06:21.gzip</ulink>. &merged;</para>
+ <para>Several vulnerabilities have been fixed in OpenSSH. More
+ details can be found in security advisory
+ <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-06:22.openssh.asc">FreeBSD-SA-06:22.openssh</ulink>. &merged;</para>
+
<para>Multiple errors in the OpenSSL &man.crypto.3; library have
been fixed. Potential effects are varied, and are documented in
more detail in security advisory
@@ -777,17 +781,18 @@
This feature can be re-enabled by using a new sysctl variable
<varname>net.inet6.ip6.mcast_pmtu</varname>. &merged;</para>
+ <para>IPv6 link-local addresses are now enabled only
+ if <varname>ipv6_enable</varname> is set in &man.rc.conf.5;.
+ &merged;</para>
+
<para>The &man.ipfw.4; IP packet filter now supports IPv6. &merged;</para>
- <para>The &man.ipfw.4; firewall system now supports substitution of the action
- argument with the value obtained from table lookup,
- which allows some optimization of rulesets.
- This is now applicable only to <literal>pipe</literal>,
- <literal>queue</literal>,
- <literal>divert</literal>,
- <literal>tee</literal>,
- <literal>netgraph</literal>,
- and <literal>ngtee</literal> rules. &merged;
+ <para>The &man.ipfw.4; firewall system now supports
+ a <literal>tablearg</literal> feature, which allows
+ values obtained from a table lookup to be used as part of a
+ rule. &merged;
+ This feature can be used to optimize some rulesets
+ or to implement policy-based routing inside a firewall.
For example, the following rules will throw different
packets to different pipes:</para>
@@ -805,7 +810,7 @@
The tag acts as an internal marker (it is not sent out over
the wire) that can be used to identify these packets later on,
for example, by using <literal>tagged</literal>
- rule option. For more details, see &man.ipfw.8;.</para>
+ rule option. For more details, see &man.ipfw.8;. &merged;</para>
<para>The <literal>IPFIREWALL_FORWARD_EXTENDED</literal> kernel
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list