PERFORCE change 74785 for review
David Xu
davidxu at FreeBSD.org
Sat Apr 9 01:25:44 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=74785
Change 74785 by davidxu at davidxu_tiger on 2005/04/09 08:25:22
IFC.
Affected files ...
.. //depot/projects/davidxu_thread/src/etc/rc.initdiskless#1 branch
.. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/Makefile.inc#2 integrate
.. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/bcmp.S#1 branch
.. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/bcopy.S#2 integrate
.. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/memcmp.S#1 branch
.. //depot/projects/davidxu_thread/src/lib/libc/gen/fnmatch.c#2 integrate
.. //depot/projects/davidxu_thread/src/lib/libc/gen/setmode.c#2 integrate
.. //depot/projects/davidxu_thread/src/lib/libc/gen/syslog.c#4 integrate
.. //depot/projects/davidxu_thread/src/lib/libc/net/getifmaddrs.c#2 integrate
.. //depot/projects/davidxu_thread/src/lib/libc/net/res_comp.c#2 integrate
.. //depot/projects/davidxu_thread/src/lib/libc/net/res_mkupdate.c#2 integrate
.. //depot/projects/davidxu_thread/src/lib/libc/stdio/vfscanf.c#2 integrate
.. //depot/projects/davidxu_thread/src/libexec/rexecd/rexecd.c#9 integrate
.. //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 integrate
.. //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 integrate
.. //depot/projects/davidxu_thread/src/sbin/ffsinfo/ffsinfo.8#4 integrate
.. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifconfig.c#4 integrate
.. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifconfig.h#4 integrate
.. //depot/projects/davidxu_thread/src/share/man/man4/cdce.4#2 integrate
.. //depot/projects/davidxu_thread/src/share/man/man4/ng_netflow.4#5 integrate
.. //depot/projects/davidxu_thread/src/share/man/man4/uftdi.4#2 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.c#6 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#5 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-chipset.c#7 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-dma.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-lowlevel.c#9 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-pci.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-pci.h#5 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/atapi-cam.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/mse/mse.c#4 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/mse/mse_cbus.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/mse/mse_isa.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/usb/uplcom.c#4 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/usb/usbdevs#9 integrate
.. //depot/projects/davidxu_thread/src/sys/geom/geom_ctl.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/i4b/layer1/isic/i4b_isic.h#3 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/kern_mutex.c#4 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/kern_switch.c#8 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/kern_synch.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/sched_4bsd.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/sched_ule.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/netgraph/bluetooth/common/ng_bluetooth.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/netinet/in_pcb.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/netinet/ip_input.c#6 integrate
.. //depot/projects/davidxu_thread/src/sys/pc98/conf/NOTES#7 integrate
.. //depot/projects/davidxu_thread/src/sys/pc98/include/apicreg.h#1 branch
.. //depot/projects/davidxu_thread/src/sys/pc98/include/apicvar.h#1 branch
.. //depot/projects/davidxu_thread/src/sys/pc98/include/ioctl_bt848.h#1 branch
.. //depot/projects/davidxu_thread/src/sys/pc98/include/ioctl_meteor.h#1 branch
.. //depot/projects/davidxu_thread/src/sys/pc98/include/pcaudio.h#2 delete
.. //depot/projects/davidxu_thread/src/sys/pc98/include/pcaudioio.h#1 branch
.. //depot/projects/davidxu_thread/src/sys/pc98/include/pcvt_ioctl.h#1 branch
.. //depot/projects/davidxu_thread/src/sys/pc98/include/pvct_ioctl.h#2 delete
.. //depot/projects/davidxu_thread/src/sys/pc98/include/smptests.h#1 branch
.. //depot/projects/davidxu_thread/src/sys/pci/agp_amd64.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/sys/proc.h#12 integrate
.. //depot/projects/davidxu_thread/src/tools/regression/msdosfs/msdosfstest.sh#1 branch
.. //depot/projects/davidxu_thread/src/usr.bin/calendar/calendars/calendar.birthday#4 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/make/parse.c#11 integrate
Differences ...
==== //depot/projects/davidxu_thread/src/lib/libc/amd64/string/Makefile.inc#2 (text+ko) ====
@@ -1,3 +1,3 @@
-# $FreeBSD: src/lib/libc/amd64/string/Makefile.inc,v 1.1 2005/04/07 03:56:03 alc Exp $
+# $FreeBSD: src/lib/libc/amd64/string/Makefile.inc,v 1.2 2005/04/08 05:15:55 alc Exp $
-MDSRCS+= bcopy.S bzero.S memcpy.S memmove.S memset.S
+MDSRCS+= bcmp.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S
==== //depot/projects/davidxu_thread/src/lib/libc/amd64/string/bcopy.S#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcopy.S,v 1.1 2005/04/07 03:56:03 alc Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcopy.S,v 1.2 2005/04/08 05:10:18 alc Exp $");
#if 0
RCSID("$NetBSD: bcopy.S,v 1.2 2003/08/07 16:42:36 agc Exp $")
@@ -51,14 +51,14 @@
#endif
#endif
#if defined(MEMCOPY) || defined(MEMMOVE)
- movq %rdi,%r11 /* save dest */
+ movq %rdi,%rax /* return dst */
#else
xchgq %rdi,%rsi
#endif
movq %rdx,%rcx
- movq %rdi,%rax
- subq %rsi,%rax
- cmpq %rcx,%rax /* overlapping? */
+ movq %rdi,%r8
+ subq %rsi,%r8
+ cmpq %rcx,%r8 /* overlapping? */
jb 1f
cld /* nope, copy forwards. */
shrq $3,%rcx /* copy by words */
@@ -68,9 +68,6 @@
andq $7,%rcx /* any bytes left? */
rep
movsb
-#if defined(MEMCOPY) || defined(MEMMOVE)
- movq %r11,%rax
-#endif
ret
1:
addq %rcx,%rdi /* copy backwards. */
@@ -87,8 +84,5 @@
subq $7,%rdi
rep
movsq
-#if defined(MEMCOPY) || defined(MEMMOVE)
- movq %r11,%rax
-#endif
cld
ret
==== //depot/projects/davidxu_thread/src/lib/libc/gen/fnmatch.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fnmatch.c,v 1.16 2004/07/29 03:13:10 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fnmatch.c,v 1.17 2005/04/08 21:24:23 stefanf Exp $");
/*
* Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
@@ -254,7 +254,6 @@
} else if (*pattern == '\0') {
return (RANGE_ERROR);
} else if (*pattern == '/' && (flags & FNM_PATHNAME)) {
- pattern++;
return (RANGE_NOMATCH);
} else if (*pattern == '\\' && !(flags & FNM_NOESCAPE))
pattern++;
==== //depot/projects/davidxu_thread/src/lib/libc/gen/setmode.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)setmode.c 8.2 (Berkeley) 3/25/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/setmode.c,v 1.9 2003/02/23 00:24:03 mikeh Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/setmode.c,v 1.10 2005/04/08 21:15:38 stefanf Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -83,9 +83,7 @@
* bits) followed by a '+' (set bits).
*/
mode_t
-getmode(bbox, omode)
- const void *bbox;
- mode_t omode;
+getmode(const void *bbox, mode_t omode)
{
const BITCMD *set;
mode_t clrval, newmode, value;
@@ -172,8 +170,7 @@
#define STANDARD_BITS (S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO)
void *
-setmode(p)
- const char *p;
+setmode(const char *p)
{
int perm, who;
char op, *ep;
@@ -340,11 +337,7 @@
}
static BITCMD *
-addcmd(set, op, who, oparg, mask)
- BITCMD *set;
- int oparg, who;
- int op;
- u_int mask;
+addcmd(BITCMD *set, int op, int who, int oparg, u_int mask)
{
switch (op) {
case '=':
@@ -388,8 +381,7 @@
#ifdef SETMODE_DEBUG
static void
-dumpmode(set)
- BITCMD *set;
+dumpmode(BITCMD *set)
{
for (; set->cmd; ++set)
(void)printf("cmd: '%c' bits %04o%s%s%s%s%s%s\n",
@@ -409,8 +401,7 @@
* compacted, but it's not worth the effort.
*/
static void
-compress_mode(set)
- BITCMD *set;
+compress_mode(BITCMD *set)
{
BITCMD *nset;
int setbits, clrbits, Xbits, op;
==== //depot/projects/davidxu_thread/src/lib/libc/gen/syslog.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.34 2004/12/30 16:05:11 glebius Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.35 2005/04/08 21:15:38 stefanf Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -101,11 +101,8 @@
* XXX: Maybe one day, dynamically allocate it so that the line length
* is `unlimited'.
*/
-static
-int writehook(cookie, buf, len)
- void *cookie; /* really [struct bufcookie *] */
- char *buf; /* characters to copy */
- int len; /* length to copy */
+static int
+writehook(void *cookie, const char *buf, int len)
{
struct bufcookie *h; /* private `handle' */
@@ -137,10 +134,7 @@
}
void
-vsyslog(pri, fmt, ap)
- int pri;
- const char *fmt;
- va_list ap;
+vsyslog(int pri, const char *fmt, va_list ap)
{
int cnt;
char ch, *p;
@@ -329,7 +323,7 @@
/* Should be called with mutex acquired */
static void
-disconnectlog()
+disconnectlog(void)
{
/*
* If the user closed the FD and opened another in the same slot,
@@ -345,7 +339,7 @@
/* Should be called with mutex acquired */
static void
-connectlog()
+connectlog(void)
{
struct sockaddr_un SyslogAddr; /* AF_UNIX address of local logger */
@@ -396,9 +390,7 @@
}
static void
-openlog_unlocked(ident, logstat, logfac)
- const char *ident;
- int logstat, logfac;
+openlog_unlocked(const char *ident, int logstat, int logfac)
{
if (ident != NULL)
LogTag = ident;
@@ -413,9 +405,7 @@
}
void
-openlog(ident, logstat, logfac)
- const char *ident;
- int logstat, logfac;
+openlog(const char *ident, int logstat, int logfac)
{
THREAD_LOCK();
openlog_unlocked(ident, logstat, logfac);
@@ -424,7 +414,7 @@
void
-closelog()
+closelog(void)
{
THREAD_LOCK();
(void)_close(LogFile);
@@ -436,8 +426,7 @@
/* setlogmask -- set the log mask level */
int
-setlogmask(pmask)
- int pmask;
+setlogmask(int pmask)
{
int omask;
==== //depot/projects/davidxu_thread/src/lib/libc/net/getifmaddrs.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getifmaddrs.c,v 1.1 2003/11/14 18:53:22 bms Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getifmaddrs.c,v 1.2 2005/04/08 21:24:23 stefanf Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -60,14 +60,12 @@
int icnt = 1;
int dcnt = 0;
int ntry = 0;
- u_short idx = 0;
size_t len;
size_t needed;
int mib[6];
int i;
char *buf;
char *data;
- char *names;
char *next;
char *p;
struct ifma_msghdr *ifmam;
@@ -128,12 +126,10 @@
ifa = (struct ifmaddrs *)(void *)data;
data += sizeof(struct ifmaddrs) * icnt;
- names = data + dcnt;
memset(ifa, 0, sizeof(struct ifmaddrs) * icnt);
ift = ifa;
- idx = 0;
for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
rtm = (struct rt_msghdr *)(void *)next;
if (rtm->rtm_version != RTM_VERSION)
==== //depot/projects/davidxu_thread/src/lib/libc/net/res_comp.c#2 (text+ko) ====
@@ -73,7 +73,7 @@
static char orig_rcsid[] = "From: Id: res_comp.c,v 8.11 1997/05/21 19:31:04 halley Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/res_comp.c,v 1.17 2002/03/22 21:52:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/res_comp.c,v 1.18 2005/04/08 21:24:23 stefanf Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -158,7 +158,7 @@
res_hnok(dn)
const char *dn;
{
- int ppch = '\0', pch = PERIOD, ch = *dn++;
+ int pch = PERIOD, ch = *dn++;
while (ch != '\0') {
int nch = *dn++;
@@ -175,7 +175,7 @@
if (!middlechar(ch))
return (0);
}
- ppch = pch, pch = ch, ch = nch;
+ pch = ch, ch = nch;
}
return (1);
}
==== //depot/projects/davidxu_thread/src/lib/libc/net/res_mkupdate.c#2 (text+ko) ====
@@ -21,7 +21,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/res_mkupdate.c,v 1.5 2003/02/18 13:39:52 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/res_mkupdate.c,v 1.6 2005/04/08 21:24:23 stefanf Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -62,7 +62,7 @@
res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
ns_updrec *rrecp_start = rrecp_in;
HEADER *hp;
- u_char *cp, *sp1, *sp2, *startp, *endp;
+ u_char *cp, *sp2, *startp, *endp;
int n, i, soanum, multiline;
ns_updrec *rrecp;
struct in_addr ina;
@@ -87,7 +87,6 @@
hp->id = htons(++_res.id);
hp->opcode = ns_o_update;
hp->rcode = NOERROR;
- sp1 = buf + 2*INT16SZ; /* save pointer to zocount */
cp = buf + HFIXEDSZ;
buflen -= HFIXEDSZ;
dpp = dnptrs;
==== //depot/projects/davidxu_thread/src/lib/libc/stdio/vfscanf.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.37 2004/05/02 10:55:05 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.38 2005/04/08 20:58:47 stefanf Exp $");
#include "namespace.h"
#include <ctype.h>
@@ -138,7 +138,6 @@
char ccltab[256]; /* character class table for %[...] */
char buf[BUF]; /* buffer for numeric and mb conversions */
wchar_t *wcp; /* handy wide character pointer */
- wchar_t *wcp0; /* saves original value of wcp */
size_t nconv; /* length of multibyte sequence converted */
static const mbstate_t initial;
mbstate_t mbs;
@@ -434,9 +433,9 @@
int nchars;
if ((flags & SUPPRESS) == 0)
- wcp = wcp0 = va_arg(ap, wchar_t *);
+ wcp = va_arg(ap, wchar_t *);
else
- wcp = wcp0 = &twc;
+ wcp = &twc;
n = 0;
nchars = 0;
while (width != 0) {
==== //depot/projects/davidxu_thread/src/libexec/rexecd/rexecd.c#9 (text+ko) ====
@@ -42,7 +42,7 @@
static char sccsid[] = "@(#)rexecd.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/libexec/rexecd/rexecd.c,v 1.40 2005/04/07 19:26:35 nectar Exp $";
+ "$FreeBSD: src/libexec/rexecd/rexecd.c,v 1.41 2005/04/08 11:19:50 des Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -86,8 +86,6 @@
static void doit(struct sockaddr *);
static void getstr(char *, int, const char *);
static void error(const char *fmt, ...);
-static struct passwd *xgetpwnam(const char *, struct passwd *, char **,
- size_t *);
int no_uid_0 = 1;
@@ -136,10 +134,9 @@
{
char *cmdbuf, *cp;
int maxcmdlen;
- char userbuf[16], pass[16];
- struct passwd *pwd, pwd_storage;
- char *pwdbuf, *user;
- size_t pwdbuflen;
+ char user[16], pass[16];
+ struct passwd *pwd;
+ const void *item;
int fd, r, sd;
u_short port;
int pv[2], pid, cc, nfds;
@@ -189,22 +186,20 @@
if (connect(sd, fromp, fromp->sa_len) < 0)
exit(1);
}
- user = userbuf;
- getstr(userbuf, sizeof(userbuf), "username");
+ getstr(user, sizeof(user), "username");
getstr(pass, sizeof(pass), "password");
getstr(cmdbuf, maxcmdlen, "command");
(void) alarm(0);
- pwdbuflen = 0;
- pwdbuf = NULL;
if (!pam_ok(pam_start("rexecd", user, &pamc, &pamh)) ||
!pam_ok(pam_set_item(pamh, PAM_RHOST, remote)) ||
!pam_ok(pam_set_item(pamh, PAM_AUTHTOK, pass)) ||
!pam_ok(pam_authenticate(pamh, pam_flags)) ||
!pam_ok(pam_acct_mgmt(pamh, pam_flags)) ||
- !pam_ok(pam_get_item(pamh, PAM_USER, (const void **)&user)) ||
- (pwd = xgetpwnam(user, &pwd_storage, &pwdbuf,
- &pwdbuflen)) == NULL || (pwd->pw_uid == 0 && no_uid_0)) {
+ !pam_ok(pam_get_item(pamh, PAM_USER, &item)) || item == NULL ||
+ strlen(item) >= sizeof(user) || strcpy(user, item) == NULL ||
+ (pwd = getpwnam(user)) == NULL ||
+ (pwd->pw_uid == 0 && no_uid_0)) {
syslog(LOG_ERR, "%s LOGIN REFUSED from %s", user, remote);
error("Login incorrect.\n");
exit(1);
@@ -329,27 +324,3 @@
}
} while (c != 0);
}
-
-static struct passwd *
-xgetpwnam(const char *user, struct passwd *pwd_storage, char **pwdbuf,
- size_t *pwdbuflen)
-{
- struct passwd *pwd;
- size_t needed;
- int rv;
-
- needed = (*pwdbuflen == 0) ? BUFSIZ : *pwdbuflen;
- pwd = NULL;
- do {
- if (needed != *pwdbuflen) {
- if ((*pwdbuf = reallocf(*pwdbuf, needed)) == NULL) {
- syslog(LOG_ERR, "Cannot allocate memory");
- error("Cannot allocate memory.\n");
- exit(1);
- } else
- *pwdbuflen = needed;
- }
- rv = getpwnam_r(user, pwd_storage, *pwdbuf, *pwdbuflen, &pwd);
- } while (pwd == NULL && rv == ERANGE && (needed <<= 1));
- return pwd;
-}
==== //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.8
- $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/layout.sgml,v 1.1 2004/10/15 06:43:46 delphij Exp $
+ Original Revision: 1.10
+ $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/layout.sgml,v 1.2 2005/04/09 03:06:55 delphij Exp $
This section contains the contents of the old LAYOUT.TXT file.
-->
@@ -20,13 +20,19 @@
INSTALL.TXT catpages compat4x games src
README.HTM cdrom.inf crypto info tools</screen>
- <para>Èç¹ûÏë´Ó CDROM¡¢ FTP »ò NFS ´Ó·¢²¼Ä¿Â¼Öа²×°£¬
- Ö»Ðè´ÓÈíÅ̾µÏñĿ¼ÖÆ×÷ 1.44MB Òýµ¼ÅÌ (²Î¼û
- <xref linkend="floppies"> ÒÔÁ˽âÈçºÎÍê³ÉËü)£¬
- ´ÓÖÆ×÷µÄÒýµ¼ÅÌÆô¶¯£¬ ²¢°´ÕÕÆÁÄ»µÄָʾȥ×ö¾Í¿ÉÒÔÁË¡£
- °²×°¹ý³ÌÖÐËùÐèÒªµÄÊý¾Ý»á¸ù¾ÝÄúµÄÑ¡Ôñ×Ô¶¯»ñÈ¡¡£
- Èç¹ûÄú֮ǰ´Óû°²×°¹ý &os;£¬ Ôò½¨ÒéÄúÍêÕûµØÔĶÁÕâ·ÝÎĵµ
- (°²×°Ö¸Òý)¡£</para>
+ <para>ÕâЩÎļþÒ²¿ÉÒÔÔÚ¶àµú×éµÄµÚÒ»ÕÅ CDROM ÉÏÕÒµ½£¬
+ Ö»ÊǸñ¾ÖÂÔÓв»Í¬¡£ ÔÚ¶àÊýƽ̨ÉÏ£¬ °²×° CDROM ÔÚ°²×°°üÎļþÖ®Í⣬
+ Ò²ÌṩÁËÒ»¸ö <quote>ÏÖ³¡Îļþϵͳ</quote>¡£ ÏÖ³¡Îļþϵͳ£¬
+ ¶ÔÓÚÐÞ¸´»òÅųöÏÖÓÐµÄ &os; °²×°µÄÎÊÌâ·Ç³£ÓÐÓà (²Î¼û <xref
+ linkend="trouble"> ÒÔÁ˽âÈçºÎÍê³ÉÕâÏ×÷)¡£</para>
+
+ <para>¶ÔÓÚÎÞ·¨´Ó CDROM ½éÖÊÒýµ¼ÏµÍ³ (µ«¿ÉÒÔͨ¹ýÆäËüÊÖ¶ÎÀ´¶ÁÈ¡ CDROM)
+ µÄÓû§À´Ëµ£¬ Ó¦¹ØעһϠ<filename>floppies</filename> Ŀ¼¡£
+ ºÜÈÝÒ×´Ó <filename>floppies</filename> ÌṩµÄÎļþÀ´×ÔÐÐÖÆ×÷ 1.44MB Òýµ¼ÅÌ
+ (²Î¼û <xref linkend="floppies"> ÒÔÁ˽âÈçºÎÕâÑù×ö)£¬ ²¢ÓÃËüÀ´¿ªÊ¼´Ó CDROM¡¢
+ FTP£¬ »òÕß NFS µÄ°²×°¡£ ÔÚ°²×°¹ý³ÌÖÐËùÐèÒªµÄÆäËûÊý¾Ý£¬
+ ½«×Ô¶¯µØ¸ù¾ÝÄúµÄÑ¡Ôñ»ñµÃ¡£ Èç¹ûÄú֮ǰ´Óδ°²×°¹ý &os;£¬
+ ÔòÓ¦ÍêÕûµØÔĶÁÕâ·ÝÎĵµ (°²×°Ö¸Òý)¡£</para>
<para>Èç¹ûÄúÔÚ³¢ÊÔ½øÐÐijÖÖÆäËûÀàÐ͵ݲװ£¬
»ò¶ÔÓÚ·¢²¼Ä¿Â¼ÊÇÈçºÎ×éÖ¯µÄ¸Ðµ½ºÃÆ棬 Çë²Î¿¼ÏÂÃæµÄ˵Ã÷ÒÔÁ˽â½øÒ»²½µÄÄÚÈÝ£º
@@ -89,7 +95,7 @@
<para>Ports Collection ¿ÉÒÔͨ¹ýÓëÆäËû×é¼þÏàͬµÄ·½·¨À´°²×°£¬
½âѹËõºóËüÐèÒª´óÔ¼ 190MB µÄ´ÅÅ̿ռ䡣 ¹ØÓÚ
ports collection µÄ¸ü¶à×ÊÁÏ¿ÉÒÔÔÚ
- <ulink url="http://www.FreeBSD.org/ports/">http://www.FreeBSD.org/ports/</ulink>
+ <ulink url="&url.base;/ports/">http://www.FreeBSD.org/ports/</ulink>
»ò±¾µØµÄ
<filename>/usr/share/doc/handbook</filename> ÕÒµ½£¬
µ±È»£¬ ºóÕßµÄÇ°ÌáÊÇÄú°²×°ÁË <filename>doc</filename>
==== //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
The FreeBSD Simplified Chinese Project
- Original Revision: 1.14
- $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml,v 1.1 2004/10/15 06:43:46 delphij Exp $
+ Original Revision: 1.17
+ $FreeBSD: src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml,v 1.2 2005/04/09 06:20:08 delphij Exp $
This file contains the comments of the old TROUBLE.TXT file.
-->
@@ -12,21 +12,48 @@
<sect2 id="repairing">
<title>ÐÞ¸´ÏÖÓÐµÄ &os; °²×°</title>
- <para>ÔÚ°²×°ÈíÅÌÖеĶ¥¼¶²Ëµ¥ÉÏ£¬ &os; ÌṩÁËÒ»¸ö
- <quote>Fixit</quote> Ñ¡Ïî¡£
- ҪʹÓÃËü£¬ Äú»¹ÐèÒªÒ»ÕźÍÆô¶¯ÓõÄÄÇÕÅÈíÅÌͬÑùµÄ·½·¨Éú³ÉµÄ
- <filename>fixit.flp</filename> ¾µÏñÈíÅÌ£¬
- »ò <quote>live filesystem</quote>
- CDROM£» µÚ¶þÖÖͨ³£ÊÇ &os; ·¢Ðа汾µÄÒ»²¿·Ö¡£</para>
+ <para>&os; ÔÚÆä°²×°³ÌÐò &man.sysinstall.8; µÄ¶¥¼¶²Ëµ¥ÉÏ£¬ ÌṩÁËÒ»¸ö
+ <quote>fixit</quote> Ñ¡Ïî¡£ ËüÌṩÁËÒ»¸ö°üº¬ &os;
+ »ù±¾ÏµÍ³Öг£ÓóÌÐòµÄ shell£» Õâ¸ö»·¾³¶ÔÓÚÐÞ¸´»òÅųýÏÖÓÐµÄ &os;
+ °²×°ÖеĹÊÕÏÊ®·ÖÓÐÓᣠҪʹÓà fixit ģʽ£¬
+ ÄúÐèÒª°´ÕÕºÍÆäËûÒýµ¼ÅÌÏàͬµÄ·½Ê½ÖÆ×÷ <filename>fixit.flp</filename> ÈíÅÌ£¬
+ »òÕßʹÓà <quote>ÏÖ³¡Îļþϵͳ</quote> CDROM¡£
+ Ò»°ãÀ´Ëµ£¬ ÏÖ³¡ÎļþϵͳӦ¸ÃÔÚ &os; °²×°¹âÅÌÖеĵÚÒ»ÕÅÉÏ¡£
+ Çë×¢Ò⣬ ʹÓà fixit Ñ¡ÏîÐèҪһЩ UNIX ϵͳ¹ÜÀíµÄ¾Ñé¡£</para>
+
+ <para>Ò»°ãÀ´Ëµ£¬ ÓÐÁ½ÖÖ·½·¨À´Æô¶¯ fixit ģʽ¡£
+ Äܹ»´Ó &os; °²×° CDROM Æô¶¯µÄÓû§£¬ Ó¦¸ÃÕâÑù×ö²¢ÔÚ
+ &man.sysinstall.8; µÄÖ÷²Ëµ¥Ñ¡Ôñ <quote>fixit</quote>¡£
+ È»ºó£¬ ÔÙÑ¡ÔñÆäÖеÄ
+ <quote>CDROM/DVD</quote> Ñ¡Ïî¡£</para>
+
+ <para>ÎÞ·¨´Ó CDROM Æô¶¯£¬ µ«¿ÉÒÔ´ÓÈíÅÌÆô¶¯µÄÓû§£¬
+ ÔòÐèÒª¸ü¶àµÄ²½Öè¡£ ³ýÁË°²×°¹ý³ÌËùÐèÒªµÄ
+ <filename>boot.flp</filename> ºÍ
+ <filename>kern<replaceable>X</replaceable>.flp</filename> Ö®Í⣬
+ »¹ÐèÒªÖÆ×÷Ò»ÕÅ
+ <filename>fixit.flp</filename> ÈíÅÌ£¬ ·½·¨ºÍÆäËûÈíÅÌÎÞÒì¡£
+ °´ÕÕÆô¶¯°²×°³ÌÐòµÄ²½Öè½øÐУ¬ Ö±µ½³öÏÖ
+ &man.sysinstall.8; ²Ëµ¥ÎªÖ¹¡£ Õâʱ£¬ Ñ¡ÔñÆäÖеÄ
+ <quote>fixit</quote> Ï ËæºóµÄ²Ëµ¥ÖУ¬
+ Ñ¡Ôñ <quote>Floppy</quote>£¬ ²¢ÒÀÌáʾ²åÈë <filename>fixit.flp</filename>
+ ÈíÅÌ¡£</para>
+
+ <para>¾¡¹Ü CDROM ºÍÈíÅÌÉ쵀 fixit »·¾³ºÜÏàËÆ£¬ µ«²¢·ÇһģһÑù¡£
+ ËüÃǶ¼ÌṩÁËһϵÁÐÓÃÓÚ¼ì²é¡¢ ÐÞ¸´Îļþϵͳ¼°ÆäÄÚÈݵÄÃüÁî¡£
+ ÔÚ CDROM É쵀 fixit °æ±¾ÌṩÁËÈ«²¿ &os; »ù±¾ÏµÍ³ÖеÄÃüÁ
+ ÒòΪËüÊÇÒ»¸öÏÖ³¡Îļþϵͳ¡£ Óë´ËÏà·´£¬ ÓÉÓÚ¿Õ¼äÏÞÖÆ£¬ ÈíÅÌ fixit »·¾³£¬
+ ÔòÖ»ÄÜÌṩËüµÄÒ»¸ö×Ó¼¯¡£</para>
+
+ <para>ÈíÅÌ°æ±¾µÄ fixit ÖУ¬
+ ¿ÉÒÔÔÚ <filename>/stand</filename> »ò
+ <filename>/mnt2/stand</filename> ÕÒµ½Ò»Ð©³£ÓõĶÀÁ¢µÄÓ¦ÓóÌÐò¡£
+ ¶øÔÚ CDROM °æ±¾µÄ fixit ÖУ¬ ÕâЩ³ÌÐò¿ÉÒÔÔÚ
+ <filename>/stand</filename> »ò
+ <filename>/mnt2/rescue</filename> ÖÐÕÒµ½ (ÓàϵijÌÐò£¬
+ ¿ÉÒÔÔÚÏÖ³¡ÎļþϵͳÖÐÕÒµ½£¬ ÆäλÖÃÊÇ
+ <filename>/mnt</filename>)¡£</para>
- <para>ÒªÆô¶¯ fixit£¬ Ö»Ðè¼òµ¥µØ´Ó
- <filename>kern.flp</filename> ÕâÕÅÈíÅÌÆô¶¯£¬ Ñ¡Ôñ
- <quote>Fixit</quote> ÕâÒ»Ï ²¢¸ù¾ÝÌáʾ²åÈë fixit ÈíÅÌ»ò CDROM¡£
- ½ÓÏÂÀ´Äú½«½øÈëÒ»¸öÌṩÁ˺ܶàÃüÁîµÄÃüÁîÐнçÃæ
- (ÔÚ <filename>/stand</filename>
- ºÍ <filename>/mnt2/stand</filename> Ŀ¼ÖÐ) À´¼ì²é¡¢
- ÐÞ¸´ºÍ¼ìÑéÎļþϵͳ¼°ÆäÄÚÈÝ¡£ ʹÓà fixit <emphasis>ÊÇ</emphasis>
- ÐèҪһЩ UNIX ϵͳ¹ÜÀíµÄ¾ÑéµÄ¡£</para>
</sect2>
<sect2>
@@ -50,9 +77,9 @@
<para>ÔÚÿ´ÎÆô¶¯Ê±Õâ¸öÑ¡Ï»á±»¸´Î»£¬
Òò´ËÓбØÒª°Ñ <literal>hint.acpi.0.disabled="1"</literal>
¼ÓÈëµ½
- <filename>/boot/loader.conf</filename>
- ÖС£ ÒªÁ˽â¹ØÓÚÆô¶¯¼ÓÔØÆ÷µÄ½øÒ»²½ÏêÇ飬 Çë²Î¿¼
- FreeBSD ʹÓÃÊֲᡣ</para>
+ <filename>/boot/loader.conf</filename>ÖС£
+ ÒªÁ˽â¹ØÓÚÆô¶¯¼ÓÔØÆ÷µÄ½øÒ»²½ÏêÇ飬 Çë²Î¿¼
+ &os; ʹÓÃÊֲᡣ</para>
</answer>
</qandaentry>
<qandaentry arch="amd64">
@@ -181,10 +208,11 @@
Intel EtherExpress Íø¿¨ÎÞ·¨Õý³£¹¤×÷¡£</para>
</question>
<answer>
- <para>Óà UserConfig ¹¤¾ß (²Î¼û
- <filename>HARDWARE.TXT</filename>) ²¢½ûÓöÔ
- <devicename>mcd0</devicename> ºÍ
- <devicename>mcd1</devicename> É豸µÄ̽²â¡£ Ò»°ã¶øÑÔ£¬
+ <para>ÔÚÒýµ¼¼ÓÔصĵÚÈý½×¶Î£¬ ÉèÖà hint
+ <quote>hint.mcd.0.disabled="1"</quote> ºÍ
+ <quote>hint.mcd.1.disabled="1"</quote>£¬
+ ¾Í¿ÉÒÔ½ûֹ̽²â <devicename>mcd0</devicename> ºÍ
+ <devicename>mcd1</devicename> É豸¡£ Ò»°ã¶øÑÔ£¬
ÔÚÄÚºËÅäÖÃÎļþÖÐÄúÓ¦¸ÃÖ»±£ÁôºÍÆôÓÃÄÇЩ½«ÒªÓõ½µÄÉ豸¡£</para>
</answer>
</qandaentry>
@@ -194,16 +222,14 @@
É豸³¬Ê±´íÎó¡£</para>
</question>
<answer>
- <para>ÄúµÄ¿¨¿ÉÄÜÓëÔÚÄÚºËÅäÖÃÖÐÖ¸¶¨µÄ IRQ ºÅ²»Í¬¡£
- ed Çý¶¯Ä¬Èϲ¢²»Ê¹ÓÃÈí¼þÅäÖà (DOS ÏÂÔÚ EZSETUP
- ÖÐÊäÈëµÄÖµ)£¬ µ«µ«Èç¹ûÄúÔÚÄÚºËÅäÖÃÎļþÖн« IRQ Ö¸¶¨Îª
- <literal>?</literal> ÔòËü»áʹÓÃÈí¼þµÄÅäÖá£</para>
+ <para>ÄúµÄ¿¨¿ÉÄÜʹÓÃÁËÓë <filename>/boot/device.hints</filename>
+ ÎļþÖÐÖ¸¶¨µÄ²»Í¬µÄ IRQ¡£ ed Çý¶¯Ä¬Èϲ¢²»Ê¹Óá®Èí¡¯ÅäÖà (ÔÚ DOS ÏÂʹÓÃ
+ EZSETUP ½øÐеÄÅäÖÃ)£¬ µ«Èç¹ûÄúÔÚ½Ó¿ÚµÄ hint ÉÏÖ¸¶¨
+ <literal>-1</literal>£¬ ¾Í»áʹÓÃÈíÅäÖá£</para>
- <para>ÁíÍ⣬ Ò²¿ÉÒÔͨ¹ýÌøÏßÀ´¸Ä±äÓ²¼þÉèÖÃ
- (Èç¹ûÐèÒª£¬ ÏàÓ¦µØÐÞ¸ÄÄÚºËÅäÖÃ)£¬
- »òÔÚ UserConfig Öн« IRQ Ö¸¶¨Îª <literal>-1</literal>£¬
- »òÔÚÄúµÄÄÚºËÅäÖÃÎļþÖÐʹÓà <literal>?</literal>
- À´¸æËßÄÚºËʹÓÃÈí¼þÅäÖá£</para>
+ <para>¿ÉÒÔͨ¹ýÌøÏßÀ´¸Ä±äÓ²¼þµÄÉ趨 (²¢¸ù¾ÝÐèÒªÐÞ¸ÄÄÚºËÅäÖÃ)
+ »òͨ¹ýÉèÖà hint <quote>hint.ed.0.irq="-1"</quote> ½«
+ IRQ Ö¸¶¨Îª <literal>-1</literal>¡£ ºóÕß½«ÈÃÄÚºËʹÓÃÈí¼þÅäÖá£</para>
<para>ÁíÒ»ÖÖ¿ÉÄÜÊÇÄúµÄ¿¨Ê¹ÓÃÁË IRQ 9£¬ ¶øÕâÊÇºÍ IRQ 2 ¹²Óõģ¬
ÕâÒ²ÊǾ³£Ôì³ÉÎÊÌâµÄÔÒò
@@ -217,11 +243,10 @@
¼üÅ̵ÄÊäÈëÒ»ÍÅÔã¡£</para>
</question>
<answer>
- <para>ÒÔÇ°µÄ IBM Ï¥ÉÏÐ͵çÄÔʹÓ÷DZê×¼µÄ¼üÅÌ¿ØÖÆÆ÷£¬
- ËùÒÔÄú±ØÐë¸æËß¼üÅÌÇý¶¯³ÌÐò (atkbd0) ½øÈëÒ»¸öÌض¨µÄģʽ
- ʹËüÄܹ»ÔÚ ThinkPads ÉϹ¤×÷¡£ ÔÚ UserConfig ÎļþÖн«
- atkbd0 'Flags' ÉèÖÃΪ 0x4£¬ Ëü¾ÍÓ¦¸ÃÄÜÕý³£µÄ¹¤×÷ÁË¡£
- (²Î¼û 'Keyboard' ÊäÈë²Ëµ¥)</para>
+ <para>½ÏÔçµÄ IBM ±Ê¼Ç±¾Ê¹ÓÃÁ˷DZê×¼µÄ¼üÅÌ¿ØÖÆÆ÷£¬
+ Òò´ËÄú±ØÐë¸æËß¼üÅÌÇý¶¯ (atkbd0) ½øÈëÓë ThinkPad
+ Ðͬ¹¤×÷µÄÒ»¸öÌØÊâģʽ¡£ ÉèÖÃ
+ hint <quote>hint.atkbd.0.flags="4"</quote> Ó¦¸ÃÄÜÈÃÆäÕý³£¹¤×÷¡£</para>
</answer>
</qandaentry>
<qandaentry>
@@ -241,20 +266,8 @@
</question>
<answer>
<para>ÕâÊÇÒ»¸öÒÑÖªÎÊÌ⣬ ²¢ÓûáÔÚ½«À´¶ÔÆä½øÐÐÐÞ¸´¡£
- ΪÁËʹÄúµÄϵͳÍêÈ«°²×°£¬ ʹÓà <option>-c</option> Òýµ¼Ñ¡Ïî½øÈë
- UserConfig£¬ µ«ÊÇ <emphasis>²»ÄÜ</emphasis> ʹÓúÿ´µÄ¿ÉÊÓ»¯Ä£Ê½£¬
- ¶ø±ØÐëʹÓþÉʽµÄÎı¾ CLI ģʽ¡£ ÔÚÌáʾ·ûÏÂÊäÈ룺</para>
-
- <screen><userinput>eisa 12</userinput>
-<userinput>quit</userinput></screen>
-
- <para>¡£ (ÄúÒ²¿ÉÒÔÓà ¡®visual¡¯ ´úÌæ ¡®quit¡¯£¬
- ÔÚ½ÓÏÂÀ´µÄÅäÖöԻ°ÔÚ¿ÉÊÓ»¯Ä£Ê½¡£)
- ¾¡¹ÜÎÒÃÇÍƼöÄú±àÒ붨ÖƵÄÄںˣ¬ µ« dset ÏÖÔÚÒ²Äܹ»±£´æÕâЩֵÁË¡£</para>
-
- <para>²Î¿¼ FAQ Ö÷Ìâ 5.3 ½âÊ͵ÄÎÊÌâºÍÔõÑù¼ÌÐø¡£
- ÔÚÄúµÄ±¾µØϵͳ /usr/share/doc/FAQ Ŀ¼ÖпÉÒÔÕÒµ½ FAQ£¬
- Èç¹ûÄú°²×°ÁË ¡®doc¡¯ Èí¼þ°üµÄ»°¡£</para>
+ ÒªÈÃϵͳÄܹ»Õý³£°²×°£¬
+ ÐèÒªÔÚ¼ÓÔØÆ÷µÚÈý½×¶ÎÉèÖà hint <quote>hw.eisa_slots="12"</quote>¡£</para>
</answer>
</qandaentry>
<qandaentry>
@@ -265,16 +278,8 @@
<answer>
<para>ÓÉÓÚijЩÔÒò£¬ ÄúµÄ»úÆ÷¿ÉÄܲ»Ï²»¶ÐµÄ
<literal>i586_copyout</literal> ºÍ
- <literal>i586_copyin</literal> ´úÂë¡£ Òª½ûÖ¹Ëü£¬
- Óð²×°ÈíÅ̽øÐÐÒýµ¼£¬ µ±Ëü½øÈëµÚÒ»¸ö²Ëµ¥ (Ñ¡ÔñÊÇ·ñ½øÈë UserConfig)
- ʱѡÔñÃüÁîÐнçÃæ
- (<quote>ר¼Òģʽ, Expert Mode</quote>)£¬
- ²¢ÇÒÊäÈëÏÂÃæµÄÓï¾ä£º</para>
-
- <screen><userinput>flags npx0 1</userinput></screen>
-
- <para>¼ÌÐøÕý³£µÄÒýµ¼¹ý³Ì¡£ ÕâЩÉèÖý«±£´æÔÚÄúµÄÄÚºËÖУ¬
- Òò´ËÄúÖ»Ðè×öÒ»´Î¾Í¿ÉÒÔÁË¡£</para>
+ <literal>i586_copyin</literal> ´úÂë¡£
+ Òª½ûÓÃËüÃÇ£¬ ÐèÒªÉèÖà hint <quote>hint.npx.0.flags="1"</quote>¡£</para>
</answer>
</qandaentry>
<qandaentry>
@@ -292,8 +297,8 @@
</question>
<answer>
<para>Compaq ϵͳ×ÜÊÇÓëÆäËüϵͳÓе㲻ͬ£¬ ËûÃÇûÓÐÔڱʼDZ¾µÄ CMOS RAM
- ÖÐ˵Ã÷ÈíÇýµÄ´æÔÚ¡£ Òò´Ë£¬ Çý¶¯³ÌÐò»áÈÏΪûÓÐÅäÖÃÈíÇý¡£
- ½øÈë UserConfig ÆÁÄ»£¬ ½« fdc0 Çý¶¯±êÖ¾ÖµÉèÖÃΪ 0x1¡£
+ ÖÐ˵Ã÷ÈíÇýµÄ´æÔÚ¡£ Òò´Ë£¬ Çý¶¯³ÌÐò»áÈÏΪûÓÐÅäÖÃÈíÇý¡£ ÄúÐèÒªÉèÖà hint
+ <quote>hint.fdc.0.flags="1"</quote>
ÕâÑùÇý¶¯³ÌÐò½«ÈÏΪµÚÒ»¸öÈíÇý´æÔÚ£¬ ¶ø²»È¥²éѯ CMOS¡£</para>
</answer>
</qandaentry>
==== //depot/projects/davidxu_thread/src/sbin/ffsinfo/ffsinfo.8#4 (text+ko) ====
@@ -35,7 +35,7 @@
.\" SUCH DAMAGE.
.\"
.\" $TSHeader: src/sbin/ffsinfo/ffsinfo.8,v 1.3 2000/12/12 19:30:55 tomsoft Exp $
-.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.16 2005/03/31 04:05:17 rwatson Exp $
+.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.17 2005/04/08 10:32:22 ceri Exp $
.\"
.Dd September 8, 2000
.Dt FSINFO 8
@@ -106,7 +106,7 @@
indirect block dump
.El
.It Fl o Ar outfile
-This allows to set the output filename where the dump is written to, and
+This sets the output filename where the dump is written to, and
must be specified.
If
.Fl
==== //depot/projects/davidxu_thread/src/sbin/ifconfig/ifconfig.c#4 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.110 2004/12/31 19:46:27 sam Exp $";
+ "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.112 2005/04/08 21:37:41 stefanf Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -467,7 +467,7 @@
callbacks = cb;
}
-/* specially-handled comamnds */
+/* specially-handled commands */
static void setifaddr(const char *, int, int, const struct afswtch *);
static const struct cmd setifaddr_cmd = DEF_CMD("ifaddr", 0, setifaddr);
@@ -502,25 +502,25 @@
*/
p = (setaddr ? &setifdstaddr_cmd : &setifaddr_cmd);
}
- if (p->c_func || p->c_func2) {
+ if (p->c_u.c_func || p->c_u.c_func2) {
if (p->c_parameter == NEXTARG) {
if (argv[1] == NULL)
errx(1, "'%s' requires argument",
p->c_name);
- p->c_func(argv[1], 0, s, afp);
+ p->c_u.c_func(argv[1], 0, s, afp);
argc--, argv++;
} else if (p->c_parameter == OPTARG) {
- p->c_func(argv[1], 0, s, afp);
+ p->c_u.c_func(argv[1], 0, s, afp);
if (argv[1] != NULL)
argc--, argv++;
} else if (p->c_parameter == NEXTARG2) {
if (argc < 3)
errx(1, "'%s' requires 2 arguments",
p->c_name);
- p->c_func2(argv[1], argv[2], s, afp);
+ p->c_u.c_func2(argv[1], argv[2], s, afp);
argc -= 2, argv += 2;
} else
- p->c_func(*argv, p->c_parameter, s, afp);
+ p->c_u.c_func(*argv, p->c_parameter, s, afp);
}
argc--, argv++;
}
==== //depot/projects/davidxu_thread/src/sbin/ifconfig/ifconfig.h#4 (text+ko) ====
@@ -31,7 +31,7 @@
*
* so there!
*
- * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.15 2004/12/31 19:46:27 sam Exp $
+ * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.16 2005/04/08 21:37:41 stefanf Exp $
*/
#define __constructor __attribute__((constructor))
@@ -51,7 +51,7 @@
union {
c_func *c_func;
c_func2 *c_func2;
- };
+ } c_u;
struct cmd *c_next;
};
void cmd_register(struct cmd *);
==== //depot/projects/davidxu_thread/src/share/man/man4/cdce.4#2 (text+ko) ====
@@ -26,7 +26,7 @@
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $
-.\" $FreeBSD: src/share/man/man4/cdce.4,v 1.1 2005/03/22 14:52:40 sobomax Exp $
+.\" $FreeBSD: src/share/man/man4/cdce.4,v 1.2 2005/04/08 10:38:12 joel Exp $
.\"
.Dd October 22, 2004
.Dt CDCE 4
@@ -73,7 +73,7 @@
.Sh DIAGNOSTICS
.Bl -diag
.It "cdce%d: no union descriptor"
-The driver couldn't fetch an interface descriptor from the USB
+The driver could not fetch an interface descriptor from the USB
device.
For a manually added USB vendor/product, the CDCE_NO_UNION flag
can be tried to work around the missing descriptor.
==== //depot/projects/davidxu_thread/src/share/man/man4/ng_netflow.4#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/share/man/man4/ng_netflow.4,v 1.8 2005/03/23 10:08:28 glebius Exp $
+.\" $FreeBSD: src/share/man/man4/ng_netflow.4,v 1.9 2005/04/08 10:38:12 joel Exp $
.\"
.Dd March 23, 2005
.Os
@@ -218,7 +218,7 @@
The latter sends us a copy of IP packets, which we analyze and free.
On
.Va fxp0:
-we don't use tee, but send packets back to ether node.
+we do not use tee, but send packets back to ether node.
.Bd -literal -offset indent
/usr/sbin/ngctl -f- <<-SEQ
# connect ng0's tee to iface0 hook
==== //depot/projects/davidxu_thread/src/share/man/man4/uftdi.4#2 (text+ko) ====
@@ -34,9 +34,9 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/uftdi.4,v 1.6 2004/10/30 09:25:11 le Exp $
+.\" $FreeBSD: src/share/man/man4/uftdi.4,v 1.7 2005/04/08 18:12:07 brueffer Exp $
.\"
-.Dd October 30, 2004
+.Dd April 8, 2004
.Dt UFTDI 4
.Os
.Sh NAME
@@ -49,7 +49,7 @@
The
.Nm
driver provides support for various serial adapters based on the FTDI
-FT8U100AX and FT8U232AM chips.
+FT2232C, FT8U100AX and FT8U232AM chips.
.Pp
The device is accessed through the
.Xr ucom 4
==== //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.238 2005/04/06 10:22:56 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.239 2005/04/08 09:37:47 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -122,7 +122,7 @@
mtx_init(&ch->queue_mtx, "ATA queue lock", NULL, MTX_DEF);
TAILQ_INIT(&ch->ata_queue);
- /* initialise device(s) on this channel */
+ /* reset the controller HW, the channel and device(s) */
while (ATA_LOCKING(dev, ATA_LF_LOCK) != ch->unit)
tsleep(&error, PRIBIO, "ataatch", 1);
ch->hw.reset(ch);
@@ -205,7 +205,7 @@
ch->state = ATA_STALL_QUEUE;
mtx_unlock(&ch->state_mtx);
- /* reset the channel and devices */
+ /* reset the controller HW, the channel and device(s) */
ch->hw.reset(ch);
/* reinit the children and delete any that fails */
==== //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#5 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.89 2005/04/06 10:22:56 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.90 2005/04/08 09:37:47 sos Exp $
*/
/* ATA register defines */
@@ -103,44 +103,76 @@
#define ATA_A_4BIT 0x08 /* 4 head bits */
#define ATA_A_HOB 0x80 /* High Order Byte enable */
-/* ATAPI misc defines */
-#define ATAPI_MAGIC_LSB 0x14
-#define ATAPI_MAGIC_MSB 0xeb
-#define ATAPI_P_READ (ATA_S_DRQ | ATA_I_IN)
-#define ATAPI_P_WRITE (ATA_S_DRQ)
-#define ATAPI_P_CMDOUT (ATA_S_DRQ | ATA_I_CMD)
-#define ATAPI_P_DONEDRQ (ATA_S_DRQ | ATA_I_CMD | ATA_I_IN)
-#define ATAPI_P_DONE (ATA_I_CMD | ATA_I_IN)
-#define ATAPI_P_ABORT 0
+/* SATA register defines */
+#define ATA_SSTATUS 13
+#define ATA_SS_DET_MASK 0x0000000f
+#define ATA_SS_DET_NO_DEVICE 0x00000000
+#define ATA_SS_DET_DEV_PRESENT 0x00000001
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list