Date: Wed, 13 Nov 2002 15:26:16 -0800 (PST) From: Juli Mallett <jmallett@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21053 for review Message-ID: <200211132326.gADNQGb9079556@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21053 Change 21053 by jmallett@jmallett_dalek on 2002/11/13 15:26:14 IFC. Affected files ... .. //depot/projects/mips/MAINTAINERS#5 integrate .. //depot/projects/mips/bin/echo/echo.c#2 integrate .. //depot/projects/mips/contrib/lukemftpd/ChangeLog#2 integrate .. //depot/projects/mips/contrib/lukemftpd/acconfig.h#2 integrate .. //depot/projects/mips/contrib/lukemftpd/config.h.in#2 integrate .. //depot/projects/mips/contrib/lukemftpd/configure#2 integrate .. //depot/projects/mips/contrib/lukemftpd/configure.in#2 integrate .. //depot/projects/mips/contrib/lukemftpd/lukemftpd.h#2 integrate .. //depot/projects/mips/contrib/lukemftpd/todo#2 integrate .. //depot/projects/mips/contrib/one-true-awk/FREEBSD-upgrade#2 integrate .. //depot/projects/mips/etc/defaults/rc.conf#4 integrate .. //depot/projects/mips/etc/inetd.conf#4 integrate .. //depot/projects/mips/include/unistd.h#4 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_writev.c#2 integrate .. //depot/projects/mips/lib/libdisk/libdisk.3#3 integrate .. //depot/projects/mips/lib/libdisk/libdisk.h#5 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_init.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/mips/lib/libutil/login_class.c#3 integrate .. //depot/projects/mips/libexec/Makefile#2 integrate .. //depot/projects/mips/libexec/lukemftpd/Makefile#3 integrate .. //depot/projects/mips/libexec/lukemftpd/config.h#2 integrate .. //depot/projects/mips/libexec/mknetid/mknetid.c#2 integrate .. //depot/projects/mips/release/Makefile#7 integrate .. //depot/projects/mips/release/i386/dokern.sh#6 integrate .. //depot/projects/mips/release/i386/drivers.conf#5 integrate .. //depot/projects/mips/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/mips/sys/bluetooth/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/common/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/common/ng_bluetooth.c#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/bt3c/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/bt3c/ng_bt3c.4#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/h4/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/h4/TODO#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/h4/ng_h4.4#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/h4/ng_h4.c#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/h4/ng_h4_prse.h#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/h4/ng_h4_var.h#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/ubt/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/ubt/ng_ubt.4#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/ubt/ng_ubt.c#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/ubt/ng_ubt_var.h#2 delete .. //depot/projects/mips/sys/bluetooth/hci/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/hci/TODO#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci.4#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_cmds.c#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_cmds.h#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_evnt.c#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_evnt.h#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_main.c#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_misc.c#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_misc.h#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_prse.h#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_ulpi.c#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_ulpi.h#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_var.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_bluetooth.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_bt3c.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_btsocket.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_btsocket_hci_raw.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_btsocket_l2cap.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_h4.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_hci.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_l2cap.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_ubt.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/TODO#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap.4#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_cmds.c#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_cmds.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_evnt.c#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_evnt.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_llpi.c#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_llpi.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_main.c#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_misc.c#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_misc.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_prse.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_var.h#2 delete .. //depot/projects/mips/sys/bluetooth/socket/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/socket/TODO#2 delete .. //depot/projects/mips/sys/bluetooth/socket/ng_btsocket.4#2 delete .. //depot/projects/mips/sys/bluetooth/socket/ng_btsocket.c#2 delete .. //depot/projects/mips/sys/bluetooth/socket/ng_btsocket_hci_raw.c#2 delete .. //depot/projects/mips/sys/bluetooth/socket/ng_btsocket_l2cap.c#2 delete .. //depot/projects/mips/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 delete .. //depot/projects/mips/sys/conf/files#9 integrate .. //depot/projects/mips/sys/conf/majors#5 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/mips/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/mips/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/mips/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/mips/sys/dev/firewire/fwdev.c#1 branch .. //depot/projects/mips/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/mips/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/mips/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/mips/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/mips/sys/kern/kern_mac.c#8 integrate .. //depot/projects/mips/sys/kern/subr_witness.c#5 integrate .. //depot/projects/mips/sys/modules/firewire/firewire/Makefile#3 integrate .. //depot/projects/mips/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/mips/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/mips/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/mips/sys/security/mac_none/mac_none.c#6 integrate .. //depot/projects/mips/sys/security/mac_test/mac_test.c#6 integrate .. //depot/projects/mips/sys/sys/mac.h#5 integrate .. //depot/projects/mips/sys/sys/mac_policy.h#6 integrate .. //depot/projects/mips/usr.bin/bluetooth/Makefile#2 delete .. //depot/projects/mips/usr.bin/bluetooth/btsockstat/Makefile#2 delete .. //depot/projects/mips/usr.bin/bluetooth/btsockstat/btsockstat.1#2 delete .. //depot/projects/mips/usr.bin/bluetooth/btsockstat/btsockstat.c#2 delete .. //depot/projects/mips/usr.bin/fetch/fetch.c#3 integrate .. //depot/projects/mips/usr.sbin/bluetooth/Makefile#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/Makefile#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/hccontrol.8#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/hccontrol.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/info.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/link_control.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/link_policy.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/node.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/send_recv.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/status.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/util.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hcseriald/Makefile#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hcseriald/hcseriald.8#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hcseriald/hcseriald.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2control/Makefile#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2control/l2cap.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2control/l2control.8#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2control/l2control.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2control/l2control.h#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2ping/Makefile#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2ping/l2ping.8#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2ping/l2ping.c#2 delete .. //depot/projects/mips/usr.sbin/sysinstall/label.c#4 integrate Differences ... ==== //depot/projects/mips/MAINTAINERS#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.51 2002/11/10 16:23:31 mjacob Exp $ +$FreeBSD: src/MAINTAINERS,v 1.52 2002/11/11 16:56:40 mjacob Exp $ subsystem login notes ----------------------------- @@ -45,7 +45,6 @@ ch(4) ken Pre-commit review requested. isp(4) mjacob Pre-commit review requested. mpt(4) mjacob Pre-commit review requested. -sa(4) mjacob Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. ==== //depot/projects/mips/bin/echo/echo.c#2 (text+ko) ==== @@ -43,10 +43,9 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.13 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.14 2002/11/13 01:39:02 njl Exp $"); -#include <stdio.h> -#include <stdlib.h> +#include <unistd.h> #include <string.h> /* ARGSUSED */ @@ -64,6 +63,9 @@ nflag = 0; while (argv[0] != NULL) { + size_t len; + + len = strlen(argv[0]); /* * If the next argument is NULL then this is this @@ -71,23 +73,20 @@ * for a trailing \c. */ if (argv[1] == NULL) { - size_t len; - - len = strlen(argv[0]); /* is there room for a '\c' and is there one? */ if (len >= 2 && argv[0][len - 2] == '\\' && argv[0][len - 1] == 'c') { /* chop it and set the no-newline flag. */ - argv[0][len - 2] = '\0'; + len -= 2; nflag = 1; } } - (void)printf("%s", argv[0]); + write(STDOUT_FILENO, argv[0], len); if (*++argv) - putchar(' '); + write(STDOUT_FILENO, " ", 1); } if (!nflag) - putchar('\n'); + write(STDOUT_FILENO, "\n", 1); return 0; } ==== //depot/projects/mips/contrib/lukemftpd/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,14 @@ +Thu May 23 02:43:41 UTC 2002 lukem + + * released 1.2 beta 2 + + * replace fnmatch(3) if FNM_CASEFOLD isn't available + +Sat Mar 16 01:28:28 UTC 2002 lukem + + * libukem/glob.c: Fix two problems in the KNR->ANSI conversion + noticed by Yuji Yamano <yyamano@kt.rim.or.jp> + Thu Mar 14 06:02:31 UTC 2002 lukem * released 1.2 beta 1 ==== //depot/projects/mips/contrib/lukemftpd/acconfig.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $Id: acconfig.h,v 1.9 2001/04/28 07:11:06 lukem Exp $ */ +/* $Id: acconfig.h,v 1.10 2002/05/23 02:42:55 lukem Exp $ */ @TOP@ @BOTTOM@ @@ -48,6 +48,9 @@ /* Define if fclose() is declared in <stdio.h> */ #undef HAVE_FCLOSE_D +/* Define if FNM_CASEFOLD is declared in <fnmatch.h> */ +#undef HAVE_FNM_CASEFOLD + /* Define if optarg is declared in <stdlib.h> or <unistd.h> */ #undef HAVE_OPTARG_D ==== //depot/projects/mips/contrib/lukemftpd/config.h.in#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ -/* $Id: config.h.in,v 1.15 2001/04/28 07:11:46 lukem Exp $ */ +/* $Id: config.h.in,v 1.16 2002/05/23 02:42:55 lukem Exp $ */ /* Define if the closedir function returns void instead of int. */ @@ -221,6 +221,9 @@ /* Define if fclose() is declared in <stdio.h> */ #undef HAVE_FCLOSE_D +/* Define if FNM_CASEFOLD is declared in <fnmatch.h> */ +#undef HAVE_FNM_CASEFOLD + /* Define if optarg is declared in <stdlib.h> or <unistd.h> */ #undef HAVE_OPTARG_D ==== //depot/projects/mips/contrib/lukemftpd/configure#2 (text+ko) ==== @@ -3181,14 +3181,55 @@ + echo $ac_n "checking for FNM_CASEFOLD""... $ac_c" 1>&6 +echo "configure:3186: checking for FNM_CASEFOLD" >&5 +if eval "test \"`echo '$''{'ftp_cv_HAVE_FNM_CASEFOLD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext <<EOF +#line 3192 "configure" +#include "confdefs.h" + +#include <fnmatch.h> +int main() { + int X = FNM_CASEFOLD ; +; return 0; } +EOF +if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ftp_cv_HAVE_FNM_CASEFOLD=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ftp_cv_HAVE_FNM_CASEFOLD=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ftp_cv_HAVE_FNM_CASEFOLD" 1>&6 + if test "x$ftp_cv_HAVE_FNM_CASEFOLD" = "xyes"; then + cat >> confdefs.h <<\EOF +#define HAVE_FNM_CASEFOLD 1 +EOF + + else + LIBOBJS="$LIBOBJS fnmatch.o" + : + fi + + + echo $ac_n "checking for optarg declaration""... $ac_c" 1>&6 -echo "configure:3186: checking for optarg declaration" >&5 +echo "configure:3227: checking for optarg declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTARG_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3192 "configure" +#line 3233 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3197,7 +3238,7 @@ char *X = optarg ; ; return 0; } EOF -if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_OPTARG_D=yes else @@ -3224,13 +3265,13 @@ echo $ac_n "checking for optind declaration""... $ac_c" 1>&6 -echo "configure:3228: checking for optind declaration" >&5 +echo "configure:3269: checking for optind declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTIND_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3234 "configure" +#line 3275 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3239,7 +3280,7 @@ int X = optind ; ; return 0; } EOF -if { (eval echo configure:3243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_OPTIND_D=yes else @@ -3266,13 +3307,13 @@ echo $ac_n "checking for optreset""... $ac_c" 1>&6 -echo "configure:3270: checking for optreset" >&5 +echo "configure:3311: checking for optreset" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTRESET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3276 "configure" +#line 3317 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3281,7 +3322,7 @@ int X = optreset ; ; return 0; } EOF -if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ftp_cv_HAVE_OPTRESET=yes else @@ -3308,13 +3349,13 @@ echo $ac_n "checking for pclose() declaration""... $ac_c" 1>&6 -echo "configure:3312: checking for pclose() declaration" >&5 +echo "configure:3353: checking for pclose() declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_PCLOSE_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3318 "configure" +#line 3359 "configure" #include "confdefs.h" #include <stdio.h> @@ -3322,7 +3363,7 @@ int (*X)() = pclose ; ; return 0; } EOF -if { (eval echo configure:3326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_PCLOSE_D=yes else @@ -3350,13 +3391,13 @@ if test $ac_cv_func_getusershell = yes; then echo $ac_n "checking for getusershell() declaration""... $ac_c" 1>&6 -echo "configure:3354: checking for getusershell() declaration" >&5 +echo "configure:3395: checking for getusershell() declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_GETUSERSHELL_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3360 "configure" +#line 3401 "configure" #include "confdefs.h" #include <unistd.h> @@ -3364,7 +3405,7 @@ char *(*X)() = getusershell ; ; return 0; } EOF -if { (eval echo configure:3368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_GETUSERSHELL_D=yes else @@ -3395,13 +3436,13 @@ echo $ac_n "checking *printf() support for %lld""... $ac_c" 1>&6 -echo "configure:3399: checking *printf() support for %lld" >&5 +echo "configure:3440: checking *printf() support for %lld" >&5 can_printf_longlong=no if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 3405 "configure" +#line 3446 "configure" #include "confdefs.h" #include <stdio.h> @@ -3412,7 +3453,7 @@ } EOF -if { (eval echo configure:3416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -3432,12 +3473,12 @@ if test $can_printf_longlong != yes; then echo $ac_n "checking *printf() support for %qd""... $ac_c" 1>&6 -echo "configure:3436: checking *printf() support for %qd" >&5 +echo "configure:3477: checking *printf() support for %qd" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 3441 "configure" +#line 3482 "configure" #include "confdefs.h" #include <stdio.h> @@ -3448,7 +3489,7 @@ } EOF -if { (eval echo configure:3452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -3479,12 +3520,12 @@ for ac_func in strtoll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3483: checking for $ac_func" >&5 +echo "configure:3524: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3488 "configure" +#line 3529 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3507,7 +3548,7 @@ ; return 0; } EOF -if { (eval echo configure:3511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3542,13 +3583,13 @@ if test $ac_cv_func_getaddrinfo = yes -a ! -n "$socks"; then echo $ac_n "checking for AI_NUMERICHOST""... $ac_c" 1>&6 -echo "configure:3546: checking for AI_NUMERICHOST" >&5 +echo "configure:3587: checking for AI_NUMERICHOST" >&5 if eval "test \"`echo '$''{'ftp_cv_have_ai_numerichost'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3552 "configure" +#line 3593 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3558,7 +3599,7 @@ int X = AI_NUMERICHOST ; ; return 0; } EOF -if { (eval echo configure:3562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_have_ai_numerichost=yes else @@ -3581,7 +3622,7 @@ fi echo $ac_n "checking for working getaddrinfo()""... $ac_c" 1>&6 -echo "configure:3585: checking for working getaddrinfo()" >&5 +echo "configure:3626: checking for working getaddrinfo()" >&5 if test $have_rfc2553_netdb = yes; then cat >> confdefs.h <<\EOF #define HAVE_RFC2553_NETDB 1 @@ -3600,13 +3641,13 @@ if test $ac_cv_func_sl_init = yes; then echo $ac_n "checking if sl_add() returns int""... $ac_c" 1>&6 -echo "configure:3604: checking if sl_add() returns int" >&5 +echo "configure:3645: checking if sl_add() returns int" >&5 if eval "test \"`echo '$''{'ftp_cv_INT_SL_ADD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3610 "configure" +#line 3651 "configure" #include "confdefs.h" #include <stringlist.h> @@ -3614,7 +3655,7 @@ int f = sl_add((StringList *)0, "foo") ; ; return 0; } EOF -if { (eval echo configure:3618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_INT_SL_ADD=yes else @@ -3643,12 +3684,12 @@ for ac_func in fts_open strmode user_from_uid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3647: checking for $ac_func" >&5 +echo "configure:3688: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3652 "configure" +#line 3693 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3671,7 +3712,7 @@ ; return 0; } EOF -if { (eval echo configure:3675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ==== //depot/projects/mips/contrib/lukemftpd/configure.in#2 (text+ko) ==== @@ -1,10 +1,10 @@ -dnl $Id: configure.in,v 1.17 2001/12/01 02:00:48 lukem Exp $ +dnl $Id: configure.in,v 1.18 2002/05/23 02:42:55 lukem Exp $ dnl dnl configure.in -- dnl process this file with autoconf to produce a configure script. dnl -AC_REVISION($Revision: 1.17 $)dnl +AC_REVISION($Revision: 1.18 $)dnl AC_INIT(lukemftpd.h) @@ -166,6 +166,11 @@ AC_MSG_TRY_COMPILE(for fclose() declaration, ftp_cv_HAVE_FCLOSE_D, [ #include <stdio.h> ], [ int (*X)() = fclose ], [AC_DEFINE(HAVE_FCLOSE_D, 1)]) +AC_MSG_TRY_COMPILE(for FNM_CASEFOLD, ftp_cv_HAVE_FNM_CASEFOLD, [ +#include <fnmatch.h> ], [ int X = FNM_CASEFOLD ], +[AC_DEFINE(HAVE_FNM_CASEFOLD, 1)], +[LIBOBJS="$LIBOBJS fnmatch.o"]) + AC_MSG_TRY_COMPILE(for optarg declaration, ftp_cv_HAVE_OPTARG_D, [ #include <stdlib.h> #include <unistd.h> ], [ char *X = optarg ], [AC_DEFINE(HAVE_OPTARG_D, 1)]) ==== //depot/projects/mips/contrib/lukemftpd/lukemftpd.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ -/* $Id: lukemftpd.h,v 1.18 2002/03/14 06:02:24 lukem Exp $ */ +/* $Id: lukemftpd.h,v 1.20 2002/05/23 02:43:58 lukem Exp $ */ -#define FTPD_VERSION "lukemftpd 1.2 beta 1" +#define FTPD_VERSION "lukemftpd 1.2 beta 2" #include "config.h" @@ -28,7 +28,6 @@ #include <ctype.h> #include <errno.h> #include <fcntl.h> -#include <fnmatch.h> #include <grp.h> #include <limits.h> #include <locale.h> @@ -82,6 +81,12 @@ # include "ftpglob.h" #endif +#if HAVE_FNM_CASEFOLD +# include <fnmatch.h> +#else +# include "ftpfnmatch.h" +#endif + #if HAVE_PATHS_H # include <paths.h> #endif ==== //depot/projects/mips/contrib/lukemftpd/todo#2 (text+ko) ==== @@ -4,7 +4,6 @@ is not available? - IF_NAMESIZE not available on darwin - inet_net_pton() ipv6 support - - FNM_CASEFOLD for fnmatch(3) support lfcompile(5) (large files) on solaris ==== //depot/projects/mips/contrib/one-true-awk/FREEBSD-upgrade#2 (text+ko) ==== @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20020218 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20020101 ==== //depot/projects/mips/etc/defaults/rc.conf#4 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.161 2002/11/10 09:13:31 imp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.162 2002/11/12 07:10:45 imp Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -26,7 +26,7 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). -devd_enable="YES" # Run devd, to trigger progams on device tree changes. +devd_enable="NO" # Run devd, to trigger progams on device tree changes. pccard_enable="NO" # Set to YES if you want to configure PCCARD devices. pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_beep="2" # pccard beep type. ==== //depot/projects/mips/etc/inetd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.60 2002/10/29 08:41:12 obrien Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.61 2002/11/12 17:31:11 obrien Exp $ # # Internet server configuration database # @@ -6,12 +6,6 @@ # To disable a service, comment it out by prefixing the line with '#'. # To enable a service, remove the '#' at the beginning of the line. # -# WARNING: lukemftpd does not utilize PAM, MAC, per-class nologin files, -# or any login.conf resource limits or features. Use this ftpd only if this -# is appropriate for your environment. If you require these features, use -# the alternate FreeBSD ftpd below. -#ftp stream tcp nowait root /usr/libexec/lukemftpd ftpd -l -r -# #ftp stream tcp nowait root /usr/libexec/ftpd ftpd -l #ftp stream tcp6 nowait root /usr/libexec/ftpd ftpd -l #telnet stream tcp nowait root /usr/libexec/telnetd telnetd ==== //depot/projects/mips/include/unistd.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.63 2002/10/28 00:15:43 wollman Exp $ + * $FreeBSD: src/include/unistd.h,v 1.64 2002/11/12 14:41:49 mike Exp $ */ #ifndef _UNISTD_H_ @@ -361,7 +361,7 @@ ssize_t write(int, const void *, size_t); /* 1003.2-1992 */ -#if __POSIX_VISIBLE >= 199209 +#if __POSIX_VISIBLE >= 199209 || __XSI_VISIBLE size_t confstr(int, char *, size_t); int getopt(int, char * const [], const char *); @@ -370,7 +370,7 @@ #endif /* ISO/IEC 9945-1: 1996 */ -#if __POSIX_VISIBLE >= 199506 +#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE int fsync(int); /* @@ -381,13 +381,18 @@ #define _FTRUNCATE_DECLARED int ftruncate(int, off_t); #endif +#endif +#if __POSIX_VISIBLE >= 199506 int getlogin_r(char *, int); #endif /* 1003.1-2001 */ +#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE +int fchown(int, uid_t, gid_t); +int readlink(const char *, char *, int); +#endif #if __POSIX_VISIBLE >= 200112 -int fchown(int, uid_t, gid_t); int gethostname(char *, int /* socklen_t */); int setegid(gid_t); int seteuid(uid_t); @@ -408,6 +413,7 @@ /* char *ctermid(char *); */ /* XXX ??? */ int encrypt(char *, int); int fchdir(int); +long gethostid(void); int getpgid(pid_t _pid); int getsid(pid_t _pid); char *getwd(char *); /* LEGACY: obsoleted by getcwd() */ @@ -432,13 +438,20 @@ #endif #endif /* __XSI_VISIBLE */ +#if __XSI_VISIBLE <= 500 || __BSD_VISIBLE +int brk(const void *); +int chroot(const char *); +int getdtablesize(void); +int getpagesize(void) __pure2; +char *getpass(const char *); +void *sbrk(intptr_t); +#endif + #if __BSD_VISIBLE struct timeval; /* select(2) */ int acct(const char *); int async_daemon(void); -int brk(const void *); int check_utility_compat(const char *); -int chroot(const char *); const char * crypt_get_format(void); int crypt_set_format(const char *); @@ -448,12 +461,8 @@ int exect(const char *, char * const *, char * const *); char *fflagstostr(u_long); int getdomainname(char *, int); -int getdtablesize(void); int getgrouplist(const char *, gid_t, gid_t *, int *); -long gethostid(void); mode_t getmode(const void *, mode_t); -int getpagesize(void) __pure2; -char *getpass(const char *); int getpeereid(int, uid_t *, gid_t *); int getresgid(gid_t *, gid_t *, gid_t *); int getresuid(uid_t *, uid_t *, uid_t *); @@ -483,7 +492,6 @@ const char *, const char *, const char *); char *re_comp(const char *); int re_exec(const char *); -int readlink(const char *, char *, int); int reboot(int); int revoke(const char *); pid_t rfork(int); @@ -491,7 +499,6 @@ int rresvport(int *); int rresvport_af(int *, int); int ruserok(const char *, int, const char *, const char *); -void *sbrk(intptr_t); #if __BSD_VISIBLE #ifndef _SELECT_DECLARED #define _SELECT_DECLARED ==== //depot/projects/mips/lib/libc_r/uthread/uthread_writev.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_writev.c,v 1.20 2002/08/29 23:06:07 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_writev.c,v 1.21 2002/11/12 19:01:49 archie Exp $ * */ #include <sys/types.h> @@ -174,20 +174,35 @@ * interrupted by a signal */ if (curthread->interrupted) { - /* Return an error: */ - ret = -1; + if (num > 0) { + /* Return partial success: */ + ret = num; + } else { + /* Return an error: */ + errno = EINTR; + ret = -1; + } } /* - * If performing a non-blocking write or if an - * error occurred, just return whatever the write - * syscall did: + * If performing a non-blocking write, + * just return whatever the write syscall did: */ - } else if (!blocking || n < 0) { + } else if (!blocking) { /* A non-blocking call might return zero: */ ret = n; break; + /* + * If there was an error, return partial success + * (if any bytes were written) or else the error: + */ + } else if (n < 0) { + if (num > 0) + ret = num; + else + ret = n; + /* Check if the write has completed: */ } else if (idx == iovcnt) /* Return the number of bytes written: */ ==== //depot/projects/mips/lib/libdisk/libdisk.3#3 (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/lib/libdisk/libdisk.3,v 1.27 2002/10/22 09:13:02 phk Exp $ +.\" $FreeBSD: src/lib/libdisk/libdisk.3,v 1.28 2002/11/11 19:37:19 davidc Exp $ .\" " .Dd March 15, 1996 .Dt LIBDISK 3 @@ -55,7 +55,7 @@ .Nm MakeDev , .Nm MakeDevDisk , .Nm ShowChunkFlags , -.Nm chunk_n , +.Nm chunk_name , .Nm slice_type_name .Nd library interface to slice and partition labels .Sh LIBRARY @@ -64,9 +64,6 @@ .In sys/types.h .In libdisk.h .Pp -.Vt extern const char *chunk_n[] ; -.Ft const char * -.Fn slice_type_name "int type" "int subtype" .Ft struct disk * .Fn Open_Disk "const char *devname" .Ft void @@ -115,6 +112,10 @@ .Fn MakeDevDisk "struct disk *d" "const char *path" .Ft char * .Fn ShowChunkFlags "struct chunk *c" +.Ft const char * +.Fn chunk_name "chunk_e type" +.Ft const char * +.Fn slice_type_name "int type" "int subtype" .Sh DESCRIPTION .Nm Libdisk provides an interface to the low-level disk slice and partition labels. @@ -303,7 +304,11 @@ .Fn ShowChunkFlags returns a string to show flags. .Pp -Chunk name strings can be accessed directly using the external array +The +.Fn chunk_name +function takes the enumerated chunk type and returns its name. +.Fn chunk_name +replaces the old external array .Va chunk_n . .Pp .Fn slice_type_name ==== //depot/projects/mips/lib/libdisk/libdisk.h#5 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * -* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.50 2002/11/10 20:49:28 marcel Exp $ +* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.51 2002/11/11 18:55:57 davidc Exp $ * */ @@ -147,70 +147,69 @@ #define DELCHUNK_RECOVER 0x0001 -const char *chunk_name(chunk_e type); +const char *chunk_name(chunk_e); const char * -slice_type_name( int type, int subtype ); +slice_type_name(int, int); /* "chunk_n" for subtypes too */ struct disk * -Open_Disk(const char *devname); +Open_Disk(const char *); /* Will open the named disk, and return populated tree. */ void -Free_Disk(struct disk *disk); +Free_Disk(struct disk *); /* Free a tree made with Open_Disk() or Clone_Disk() */ void -Debug_Disk(struct disk *disk); +Debug_Disk(struct disk *); /* Print the content of the tree to stdout */ void -Set_Bios_Geom(struct disk *disk, u_long cyl, u_long heads, u_long sects); +Set_Bios_Geom(struct disk *, u_long, u_long, u_long); /* Set the geometry the bios uses. */ void >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211132326.gADNQGb9079556>