PERFORCE change 50311 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Apr 3 21:40:11 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=50311
Change 50311 by marcel at marcel_nfs on 2004/04/03 21:39:53
IFC @50310
Affected files ...
.. //depot/projects/gdb/bin/ps/ps.c#7 integrate
.. //depot/projects/gdb/kerberos5/lib/libgssapi/Makefile#3 integrate
.. //depot/projects/gdb/sbin/growfs/Makefile#5 integrate
.. //depot/projects/gdb/sbin/growfs/growfs.c#5 integrate
.. //depot/projects/gdb/sys/boot/sparc64/loader/metadata.c#2 integrate
.. //depot/projects/gdb/sys/dev/uart/uart_cpu_sparc64.c#8 integrate
.. //depot/projects/gdb/sys/pc98/conf/NOTES#7 integrate
Differences ...
==== //depot/projects/gdb/bin/ps/ps.c#7 (text+ko) ====
@@ -51,7 +51,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.84 2004/03/30 04:20:33 gad Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.85 2004/04/04 04:41:51 gad Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -124,7 +124,7 @@
dev_t *ttys;
uid_t *uids;
void *ptr;
- };
+ } l;
};
static int addelem_gid(struct listinfo *, const char *);
@@ -443,12 +443,12 @@
parsefmt(dfmt, 0);
if (nselectors == 0) {
- uidlist.ptr = malloc(sizeof(uid_t));
- if (uidlist.ptr == NULL)
+ uidlist.l.ptr = malloc(sizeof(uid_t));
+ if (uidlist.l.ptr == NULL)
errx(1, "malloc failed");
nselectors = 1;
uidlist.count = uidlist.maxcount = 1;
- *uidlist.uids = getuid();
+ *uidlist.l.uids = getuid();
}
/*
@@ -470,15 +470,15 @@
/* XXX - Apparently there's no KERN_PROC_GID flag. */
if (pgrplist.count == 1) {
what = KERN_PROC_PGRP | showthreads;
- flag = *pgrplist.pids;
+ flag = *pgrplist.l.pids;
nselectors = 0;
} else if (pidlist.count == 1) {
what = KERN_PROC_PID | showthreads;
- flag = *pidlist.pids;
+ flag = *pidlist.l.pids;
nselectors = 0;
} else if (ruidlist.count == 1) {
what = KERN_PROC_RUID | showthreads;
- flag = *ruidlist.uids;
+ flag = *ruidlist.l.uids;
nselectors = 0;
#if 0
/*-
@@ -487,16 +487,16 @@
*/
} else if (sesslist.count == 1) {
what = KERN_PROC_SESSION | showthreads;
- flag = *sesslist.pids;
+ flag = *sesslist.l.pids;
nselectors = 0;
#endif
} else if (ttylist.count == 1) {
what = KERN_PROC_TTY | showthreads;
- flag = *ttylist.ttys;
+ flag = *ttylist.l.ttys;
nselectors = 0;
} else if (uidlist.count == 1) {
what = KERN_PROC_UID | showthreads;
- flag = *uidlist.uids;
+ flag = *uidlist.l.uids;
nselectors = 0;
} else if (all) {
/* No need for this routine to select processes. */
@@ -523,7 +523,7 @@
*/
if (pidlist.count > 0) {
for (elem = 0; elem < pidlist.count; elem++)
- if (kp->ki_pid == pidlist.pids[elem])
+ if (kp->ki_pid == pidlist.l.pids[elem])
goto keepit;
}
/*
@@ -540,32 +540,34 @@
goto keepit;
if (gidlist.count > 0) {
for (elem = 0; elem < gidlist.count; elem++)
- if (kp->ki_rgid == gidlist.gids[elem])
+ if (kp->ki_rgid == gidlist.l.gids[elem])
goto keepit;
}
if (pgrplist.count > 0) {
for (elem = 0; elem < pgrplist.count; elem++)
- if (kp->ki_pgid == pgrplist.pids[elem])
+ if (kp->ki_pgid ==
+ pgrplist.l.pids[elem])
goto keepit;
}
if (ruidlist.count > 0) {
for (elem = 0; elem < ruidlist.count; elem++)
- if (kp->ki_ruid == ruidlist.uids[elem])
+ if (kp->ki_ruid ==
+ ruidlist.l.uids[elem])
goto keepit;
}
if (sesslist.count > 0) {
for (elem = 0; elem < sesslist.count; elem++)
- if (kp->ki_sid == sesslist.pids[elem])
+ if (kp->ki_sid == sesslist.l.pids[elem])
goto keepit;
}
if (ttylist.count > 0) {
for (elem = 0; elem < ttylist.count; elem++)
- if (kp->ki_tdev == ttylist.ttys[elem])
+ if (kp->ki_tdev == ttylist.l.ttys[elem])
goto keepit;
}
if (uidlist.count > 0) {
for (elem = 0; elem < uidlist.count; elem++)
- if (kp->ki_uid == uidlist.uids[elem])
+ if (kp->ki_uid == uidlist.l.uids[elem])
goto keepit;
}
/*
@@ -667,7 +669,7 @@
if (inf->count >= inf->maxcount)
expand_list(inf);
- inf->gids[(inf->count)++] = grp->gr_gid;
+ inf->l.gids[(inf->count)++] = grp->gr_gid;
return (1);
}
@@ -698,7 +700,7 @@
if (inf->count >= inf->maxcount)
expand_list(inf);
- inf->pids[(inf->count)++] = tempid;
+ inf->l.pids[(inf->count)++] = tempid;
return (1);
}
#undef BSD_PID_MAX
@@ -733,7 +735,7 @@
if (inf->count >= inf->maxcount)
expand_list(inf);
- inf->ttys[(inf->count)++] = sb.st_rdev;
+ inf->l.ttys[(inf->count)++] = sb.st_rdev;
return (1);
}
@@ -779,7 +781,7 @@
if (inf->count >= inf->maxcount)
expand_list(inf);
- inf->uids[(inf->count)++] = pwd->pw_uid;
+ inf->l.uids[(inf->count)++] = pwd->pw_uid;
return (1);
}
@@ -871,14 +873,14 @@
int newmax;
newmax = (inf->maxcount + 1) << 1;
- newlist = realloc(inf->ptr, newmax * inf->elemsize);
+ newlist = realloc(inf->l.ptr, newmax * inf->elemsize);
if (newlist == NULL) {
- free(inf->ptr);
+ free(inf->l.ptr);
errx(1, "realloc to %d %ss failed", newmax,
inf->lname);
}
inf->maxcount = newmax;
- inf->ptr = newlist;
+ inf->l.ptr = newlist;
return (newlist);
}
@@ -888,11 +890,11 @@
{
inf->count = inf->elemsize = inf->maxcount = 0;
- if (inf->ptr != NULL)
- free(inf->ptr);
+ if (inf->l.ptr != NULL)
+ free(inf->l.ptr);
inf->addelem = NULL;
inf->lname = NULL;
- inf->ptr = NULL;
+ inf->l.ptr = NULL;
}
static void
@@ -904,7 +906,7 @@
inf->elemsize = elemsize;
inf->addelem = artn;
inf->lname = lname;
- inf->ptr = NULL;
+ inf->l.ptr = NULL;
}
VARENT *
==== //depot/projects/gdb/kerberos5/lib/libgssapi/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/lib/libgssapi/Makefile,v 1.9 2004/02/05 18:51:48 ru Exp $
+# $FreeBSD: src/kerberos5/lib/libgssapi/Makefile,v 1.10 2004/04/04 03:31:05 nectar Exp $
LIB= gssapi
INCS= gssapi.h
@@ -50,6 +50,7 @@
add_cred.c \
add_oid_set_member.c \
address_to_krb5addr.c \
+ arcfour.c \
canonicalize_name.c \
compare_name.c \
compat.c \
==== //depot/projects/gdb/sbin/growfs/Makefile#5 (text+ko) ====
@@ -1,7 +1,7 @@
# @(#)Makefile 8.8 (Berkeley) 6/21/2000
#
# $TSHeader: src/sbin/growfs/Makefile,v 1.4 2000/12/05 19:45:24 tomsoft Exp $
-# $FreeBSD: src/sbin/growfs/Makefile,v 1.8 2004/04/03 22:26:43 le Exp $
+# $FreeBSD: src/sbin/growfs/Makefile,v 1.9 2004/04/03 23:56:24 mux Exp $
#
#GFSDBG=YES
@@ -10,7 +10,7 @@
SRCS= growfs.c
MAN= growfs.8
-WARNS?= 0
+WARNS?= 6
.if defined(GFSDBG)
SRCS+= debug.c
==== //depot/projects/gdb/sbin/growfs/growfs.c#5 (text+ko) ====
@@ -48,7 +48,7 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/sbin/growfs/growfs.c,v 1.20 2004/04/03 23:30:59 mux Exp $";
+ "$FreeBSD: src/sbin/growfs/growfs.c,v 1.21 2004/04/04 04:17:07 bde Exp $";
#endif /* not lint */
/* ********************************************************** INCLUDES ***** */
@@ -67,6 +67,7 @@
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
+#include <time.h>
#include <unistd.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
==== //depot/projects/gdb/sys/boot/sparc64/loader/metadata.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.11 2004/01/04 23:20:15 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.12 2004/04/04 05:24:13 marcel Exp $");
#include <stand.h>
#include <sys/param.h>
@@ -69,7 +69,7 @@
int
md_getboothowto(char *kargs)
{
- char buf[32];
+ char buf[32], buf2[32];
phandle_t options;
char *cp;
int howto;
@@ -131,9 +131,21 @@
if (getenv(howto_names[i].ev) != NULL)
howto |= howto_names[i].mask;
options = OF_finddevice("/options");
- OF_getprop(options, "output-device", buf, sizeof(buf));
- if (strcmp(buf, "ttya") == 0 || strcmp(buf, "ttyb") == 0)
+ OF_getprop(options, "input-device", buf, sizeof(buf));
+ OF_getprop(options, "output-device", buf2, sizeof(buf2));
+ if (strncmp(buf, "tty", sizeof("tty") - 1) == 0 && strncmp(buf2, "tty",
+ sizeof("tty") - 1) == 0)
+ howto |= RB_SERIAL;
+ else if (strcmp(buf, "keyboard") == 0 && strcmp(buf2, "screen") == 0) {
+ phandle_t chosen;
+ ihandle_t stdin, stdout;
+
+ chosen = OF_finddevice("/chosen");
+ OF_getprop(chosen, "stdin", &stdin, sizeof(stdin));
+ OF_getprop(chosen, "stdout", &stdout, sizeof(stdout));
+ if (OF_instance_to_package(stdin) == OF_instance_to_package(stdout))
howto |= RB_SERIAL;
+ }
return(howto);
}
==== //depot/projects/gdb/sys/dev/uart/uart_cpu_sparc64.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.9 2004/04/02 07:33:35 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.10 2004/04/04 05:06:26 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,13 +71,14 @@
/*
* Get the address of the UART that is selected as the console, if the
* console is an UART of course. Note that we enforce that both stdin and
- * stdout are selected. For weird configurations, use ofw_console(4).
+ * stdout are selected.
* Note that the currently active console (i.e. /chosen/stdout and
* /chosen/stdin) may not be the same as the device selected in the
* environment (ie /options/output-device and /options/input-device) because
- * the user may have changed the environment. In that case I would assume
- * that the user expects that FreeBSD uses the new console setting. There's
- * no choice, really.
+ * keyboard and screen were selected but the keyboard was unplugged or the
+ * user has changed the environment. In the latter case I would assume that
+ * the user expects that FreeBSD uses the new console setting.
+ * For weirder configurations, use ofw_console(4).
*/
static phandle_t
uart_cpu_getdev_console(phandle_t options, char *dev, size_t devsz)
@@ -89,14 +90,29 @@
return (-1);
if ((input = OF_finddevice(dev)) == -1)
return (-1);
+ if (OF_getprop(options, "output-device", buf, sizeof(buf)) == -1)
+ return (-1);
+ if (!strcmp(dev, "keyboard") && !strcmp(buf, "screen")) {
+ phandle_t chosen;
+ ihandle_t stdin, stdout;
+
+ if ((chosen = OF_finddevice("/chosen")) == -1)
+ return (-1);
+ if (OF_getprop(chosen, "stdin", &stdin, sizeof(stdin)) == -1)
+ return (-1);
+ if ((input = OF_instance_to_package(stdin)) == -1)
+ return (-1);
+ if (OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)) == -1)
+ return (-1);
+ if (OF_instance_to_package(stdout) != input)
+ return (-1);
+ snprintf(dev, devsz, "ttya");
+ } else if (OF_finddevice(buf) != input)
+ return (-1);
if (OF_getprop(input, "device_type", buf, sizeof(buf)) == -1)
return (-1);
if (strcmp(buf, "serial") != 0)
return (-1);
- if (OF_getprop(options, "output-device", buf, sizeof(buf)) == -1)
- return (-1);
- if (OF_finddevice(buf) != input)
- return (-1);
return (input);
}
==== //depot/projects/gdb/sys/pc98/conf/NOTES#7 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.31 2004/04/01 14:23:41 nyan Exp $
+# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.32 2004/04/04 04:41:52 nyan Exp $
#
#
@@ -775,7 +775,6 @@
nodevice mlx # Mylex DAC960
nodevice amr # AMI MegaRAID
nodevice twe # 3ware ATA RAID
-nodevice twa # 3ware 9000 series PATA/SATA RAID
nodevice ataraid
nodevice cm
nodevice cs
@@ -809,8 +808,6 @@
nooption DPT_LOST_IRQ
nooption DPT_RESET_HBA
nooption DPT_TIMEOUT_FACTOR
-nooption TWA_DEBUG
-nooption TWA_FLASH_FIRMWARE
nooption AAC_DEBUG
nooption ACPI_MAX_THREADS
More information about the p4-projects
mailing list