PERFORCE change 169901 for review
Alexander Motin
mav at FreeBSD.org
Wed Oct 28 20:40:17 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=169901
Change 169901 by mav at mav_mavbook on 2009/10/28 20:39:49
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/Makefile.inc1#9 integrate
.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#18 integrate
.. //depot/projects/scottl-camlock/src/contrib/ncurses/ncurses/base/lib_getch.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libbluetooth/bluetooth.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libbluetooth/bluetooth.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#8 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/pselect.3#2 delete
.. //depot/projects/scottl-camlock/src/lib/libc/gen/pselect.c#2 delete
.. //depot/projects/scottl-camlock/src/lib/libc/sys/Makefile.inc#7 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/Symbol.map#10 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/pselect.2#1 branch
.. //depot/projects/scottl-camlock/src/lib/libstand/open.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_syscalls.c#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount_nfs/mount_nfs.c#6 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/iwn.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/regdomain.5#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#12 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/southamerica#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/commands.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#25 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#24 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci_pci.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_subr.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_machdep.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysvec.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/init_sysent.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_context.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_cpuset.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_trap.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/syscalls.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/systrace_args.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pm_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_cc_functions.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/in_cksum.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/signalvar.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscall.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscall.mk#21 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#22 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#24 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/cdrom.c#4 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/Makefile.inc1#9 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.631 2009/10/21 19:39:34 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.632 2009/10/28 07:05:32 edwin Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -599,11 +599,14 @@
.if ${MK_INFO} != "no"
_install-info= install-info
.endif
+.if ${MK_ZONEINFO} != "no"
+_zoneinfo= zic tzsetup
+.endif
ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
date echo egrep find grep ${_install-info} \
ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
- test true uname wc zic
+ test true uname wc ${_zoneinfo}
#
# distributeworld
==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#18 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.211 2009/10/24 12:59:29 antoine Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.212 2009/10/28 11:14:32 kib Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20091027: pselect.3 implemented as syscall
+OLD_FILES+=usr/share/man/man3/pselect.3.gz
# 20091005: fusword.9 and susword.9 removed
OLD_FILES+=usr/share/man/man9/fusword.9.gz
OLD_FILES+=usr/share/man/man9/susword.9.gz
==== //depot/projects/scottl-camlock/src/contrib/ncurses/ncurses/base/lib_getch.c#3 (text+ko) ====
@@ -476,6 +476,12 @@
/* resizeterm can push KEY_RESIZE */
if (cooked_key_in_fifo()) {
*result = fifo_pull(sp);
+ /*
+ * Get the ERR from queue -- it is from WINCH,
+ * so we should take it out, the "error" is handled.
+ */
+ if (fifo_peek(sp) == -1)
+ fifo_pull(sp);
returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK);
}
}
==== //depot/projects/scottl-camlock/src/lib/libbluetooth/bluetooth.3#3 (text+ko) ====
@@ -23,7 +23,7 @@
.\" SUCH DAMAGE.
.\"
.\" $Id: bluetooth.3,v 1.5 2003/05/20 23:04:30 max Exp $
-.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.10 2009/04/22 15:50:03 emax Exp $
+.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.11 2009/10/26 17:27:30 emax Exp $
.\"
.Dd April 9, 2009
.Dt BLUETOOTH 3
@@ -272,7 +272,7 @@
.Pp
The
.Fn bt_devinfo
-function populates prodivded
+function populates provided
.Vt bt_devinfo
structure with the information about given Bluetooth device.
The caller is expected to pass Bluetooth device name in the
==== //depot/projects/scottl-camlock/src/lib/libbluetooth/bluetooth.h#3 (text+ko) ====
@@ -28,7 +28,7 @@
* SUCH DAMAGE.
*
* $Id: bluetooth.h,v 1.5 2003/09/14 23:28:42 max Exp $
- * $FreeBSD: src/lib/libbluetooth/bluetooth.h,v 1.5 2009/04/22 15:50:03 emax Exp $
+ * $FreeBSD: src/lib/libbluetooth/bluetooth.h,v 1.6 2009/10/26 17:27:30 emax Exp $
*/
#ifndef _BLUETOOTH_H_
@@ -163,8 +163,8 @@
int bt_devsend (int s, uint16_t opcode, void *param, size_t plen);
ssize_t bt_devrecv (int s, void *buf, size_t size, time_t to);
int bt_devreq (int s, struct bt_devreq *r, time_t to);
-int bt_devfilter(int s, struct bt_devfilter const *new,
- struct bt_devfilter *old);
+int bt_devfilter(int s, struct bt_devfilter const *newp,
+ struct bt_devfilter *oldp);
void bt_devfilter_pkt_set(struct bt_devfilter *filter, uint8_t type);
void bt_devfilter_pkt_clr(struct bt_devfilter *filter, uint8_t type);
int bt_devfilter_pkt_tst(struct bt_devfilter const *filter, uint8_t type);
==== //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#6 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.146 2009/10/06 14:05:57 rwatson Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.148 2009/10/28 11:14:32 kib Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -21,7 +21,7 @@
initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \
lockf.c lrand48.c mrand48.c nftw.c nice.c \
nlist.c nrand48.c opendir.c \
- pause.c pmadvise.c popen.c posix_spawn.c pselect.c \
+ pause.c pmadvise.c popen.c posix_spawn.c \
psignal.c pw_scan.c pwcache.c \
raise.c readdir.c readpassphrase.c rewinddir.c \
scandir.c seed48.c seekdir.c sem.c semctl.c \
@@ -62,7 +62,7 @@
posix_spawnattr_getpgroup.3 posix_spawnattr_getschedparam.3 \
posix_spawnattr_getschedpolicy.3 posix_spawnattr_init.3 \
posix_spawnattr_getsigdefault.3 posix_spawnattr_getsigmask.3 \
- pselect.3 psignal.3 pwcache.3 \
+ psignal.3 pwcache.3 \
raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \
scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \
sem_open.3 sem_post.3 sem_timedwait.3 sem_wait.3 \
==== //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#8 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.23 2009/10/06 14:05:57 rwatson Exp $
+ * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.24 2009/10/27 10:57:53 kib Exp $
*/
FBSD_1.0 {
@@ -223,7 +223,6 @@
posix_madvise;
popen;
pclose;
- pselect;
psignal;
raise;
readdir;
@@ -454,7 +453,6 @@
__opendir2;
__pause;
_pause;
- __pselect;
__pw_scan; /* Used by (at least) libutil */
__raise;
_raise;
==== //depot/projects/scottl-camlock/src/lib/libc/sys/Makefile.inc#7 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
-# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.142 2009/07/13 12:53:43 trasz Exp $
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.143 2009/10/28 11:14:32 kib Exp $
# sys sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
@@ -83,7 +83,8 @@
mq_setattr.2 \
msgctl.2 msgget.2 msgrcv.2 msgsnd.2 \
msync.2 munmap.2 nanosleep.2 nfssvc.2 ntp_adjtime.2 open.2 \
- pathconf.2 pipe.2 poll.2 posix_openpt.2 profil.2 ptrace.2 quotactl.2 \
+ pathconf.2 pipe.2 poll.2 posix_openpt.2 profil.2 \
+ pselect.2 ptrace.2 quotactl.2 \
read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \
rtprio.2
.if !defined(NO_P1003_1B)
==== //depot/projects/scottl-camlock/src/lib/libc/sys/Symbol.map#10 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.29 2009/10/11 20:19:45 jilles Exp $
+ * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.30 2009/10/27 10:55:34 kib Exp $
*/
/*
@@ -211,6 +211,7 @@
posix_openpt;
preadv;
profil;
+ pselect;
ptrace;
pwritev;
quotactl;
@@ -781,6 +782,8 @@
__sys_preadv;
_profil;
__sys_profil;
+ _pselect;
+ __sys_pselect;
_ptrace;
__sys_ptrace;
_pwritev;
==== //depot/projects/scottl-camlock/src/lib/libstand/open.c#2 (text+ko) ====
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libstand/open.c,v 1.7 2007/01/09 01:02:04 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libstand/open.c,v 1.8 2009/10/28 14:13:45 brueffer Exp $");
#include "stand.h"
@@ -113,6 +113,7 @@
/* see if we opened a raw device; otherwise, 'file' is the file name. */
if (file == (char *)0 || *file == '\0') {
f->f_flags |= F_RAW;
+ f->f_rabuf = NULL;
return (fd);
}
==== //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_syscalls.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
* 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/libthr/thread/thr_syscalls.c,v 1.21 2009/10/11 20:19:45 jilles Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.22 2009/10/27 10:55:34 kib Exp $
*/
/*
@@ -104,6 +104,8 @@
extern int __sys_connect(int, const struct sockaddr *, socklen_t);
extern int __sys_fsync(int);
extern int __sys_msync(void *, size_t, int);
+extern int __sys_pselect(int, fd_set *, fd_set *, fd_set *,
+ const struct timespec *, const sigset_t *);
extern int __sys_poll(struct pollfd *, unsigned, int);
extern ssize_t __sys_recv(int, void *, size_t, int);
extern ssize_t __sys_recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
@@ -394,7 +396,7 @@
int ret;
_thr_cancel_enter(curthread);
- ret = __pselect(count, rfds, wfds, efds, timo, mask);
+ ret = __sys_pselect(count, rfds, wfds, efds, timo, mask);
_thr_cancel_leave(curthread);
return (ret);
==== //depot/projects/scottl-camlock/src/sbin/mount_nfs/mount_nfs.c#6 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.89 2009/09/17 19:08:15 rmacklem Exp $");
+__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.90 2009/10/26 14:57:33 jh Exp $");
#include <sys/param.h>
#include <sys/linker.h>
@@ -232,16 +232,16 @@
char *pnextopt = NULL;
char *val = "";
pass_flag_to_nmount = 1;
+ pnextopt = strchr(opt, ',');
+ if (pnextopt != NULL) {
+ *pnextopt = '\0';
+ pnextopt++;
+ }
pval = strchr(opt, '=');
- pnextopt = strchr(opt, ',');
if (pval != NULL) {
*pval = '\0';
val = pval + 1;
}
- if (pnextopt) {
- *pnextopt = '\0';
- pnextopt++;
- }
if (strcmp(opt, "bg") == 0) {
opflags |= BGRND;
pass_flag_to_nmount=0;
==== //depot/projects/scottl-camlock/src/share/man/man4/iwn.4#4 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.6 2009/10/25 11:01:53 rpaulo Exp $
+.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.7 2009/10/27 17:22:03 brueffer Exp $
.\"
.Dd October 25, 2009
.Os
@@ -42,7 +42,8 @@
.Cd "device firmware"
.Ed
.Pp
-You also need to select a firmware for your device. Chose one from:
+You also need to select a firmware for your device.
+Choose one from:
.Bd -ragged -offset indent
.Cd "device iwn4965fw"
.Cd "device iwn5000fw"
@@ -57,7 +58,7 @@
to include them all.
.Pp
Alternatively, to load the driver as a
-module at boot time, place the following line in
+module at boot time, place the following lines in
.Xr loader.conf 5 :
.Bd -literal -offset indent
if_iwn_load="YES"
==== //depot/projects/scottl-camlock/src/share/man/man5/regdomain.5#2 (text+ko) ====
@@ -22,8 +22,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/regdomain.5,v 1.1 2008/04/20 20:35:46 sam Exp $
-.Dd Apri 13, 2008
+.\" $FreeBSD: src/share/man/man5/regdomain.5,v 1.2 2009/10/28 14:39:27 brueffer Exp $
+.Dd April 13, 2008
.Dt REGDOMAIN 5
.Os
.Sh NAME
@@ -44,5 +44,5 @@
XML database of 802.11 regulatory constraints
.El
.Sh SEE ALSO
-.Xr wlan 4
-.Xr ifconfig 8 ,
+.Xr wlan 4 ,
+.Xr ifconfig 8
==== //depot/projects/scottl-camlock/src/share/man/man9/Makefile#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.363 2009/10/15 14:54:35 jhb Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.364 2009/10/27 14:37:25 emaste Exp $
MAN= accept_filter.9 \
accf_data.9 \
@@ -1222,6 +1222,7 @@
timeout.9 callout_init_rw.9 \
timeout.9 callout_pending.9 \
timeout.9 callout_reset.9 \
+ timeout.9 callout_schedule.9 \
timeout.9 callout_stop.9 \
timeout.9 untimeout.9
MLINKS+=ucred.9 crcopy.9 \
==== //depot/projects/scottl-camlock/src/share/zoneinfo/southamerica#5 (text+ko) ====
@@ -1,5 +1,5 @@
# <pre>
-# @(#)southamerica 8.37
+# @(#)southamerica 8.40
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
@@ -215,9 +215,23 @@
# http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
# </a>
+# From fullinet (2009-10-18):
+# As announced in
+# <a hef="http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356">
+# http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356
+# </a>
+# (an official .gob.ar) under title: "Sin Cambio de Hora" (english: "No hour change")
+#
+# "Por el momento, el Gobierno Nacional resolvio no modificar la hora
+# oficial, decision que estaba en estudio para su implementacion el
+# domingo 18 de octubre. Desde el Ministerio de Planificacion se anuncio
+# que la Argentina hoy, en estas condiciones meteorologicas, no necesita
+# la modificacion del huso horario, ya que 2009 nos encuentra con
+# crecimiento en la produccion y distribucion energetica."
+
Rule Arg 2007 only - Dec 30 0:00 1:00 S
-Rule Arg 2008 max - Mar Sun>=15 0:00 0 -
-Rule Arg 2008 max - Oct Sun>=15 0:00 1:00 S
+Rule Arg 2008 2009 - Mar Sun>=15 0:00 0 -
+Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
# From Mariano Absatz (2004-05-21):
# Today it was officially published that the Province of Mendoza is changing
@@ -389,44 +403,39 @@
# during 2009, this timezone change will run from 00:00 the third Sunday
# in March until 24:00 of the second Saturday in October.
-# From Arthur David Olson (2009-03-16):
-# The unofficial claim at
-# <a href="http://www.timeanddate.com/news/time/san-luis-new-time-zone.html">
-# http://www.timeanddate.com/news/time/san-luis-new-time-zone.html
+# From Mariano Absatz (2009-10-16):
+# ...the Province of San Luis is a case in itself.
+#
+# The Law at
+# <a href="http://www.diputadossanluis.gov.ar/diputadosasp/paginas/verNorma.asp?NormaID=276>"
+# http://www.diputadossanluis.gov.ar/diputadosasp/paginas/verNorma.asp?NormaID=276
# </a>
-# is that "The province will most likely follow the next daylight saving schedule,
-# which is planned for the second Sunday in October."
-
-# From Alexander Krivenyshev (2009-09-19):
-# Some Argentinian Provinces (Buenos Aires, Entre Ríos) are opposing to the
-# Daylight Saving Time for the 2009-2010 season.
+# is ambiguous because establishes a calendar from the 2nd Sunday in
+# October at 0:00 thru the 2nd Saturday in March at 24:00 and the
+# complement of that starting on the 2nd Sunday of March at 0:00 and
+# ending on the 2nd Saturday of March at 24:00.
+#
+# This clearly breaks every time the 1st of March or October is a Sunday.
+#
+# IMHO, the "spirit of the Law" is to make the changes at 0:00 on the 2nd
+# Sunday of October and March.
+#
+# The problem is that the changes in the rest of the Provinces that did
+# change in 2007/2008, were made according to the Federal Law and Decrees
+# that did so on the 3rd Sunday of October and March.
#
-# (Spanish)
-# "El cambio de huso horario en Entre Ríos deberá ser aprobado por la
-# Legislatura":
-# <a href="http://www.analisisdigital.com.ar/noticias.php?ed=1&di=0&no=110168">
-# http://www.analisisdigital.com.ar/noticias.php?ed=1&di=0&no=110168
-# </a>
-# English translation - "The time zone change in Entre Rios must be approved by
-# the Legislature."
+# In fact, San Luis actually switched from UTC-4 to UTC-3 last Sunday
+# (October 11th) at 0:00.
#
-# (Spanish)
-# "Mar del Plata no quiere cambiar la hora."
-# <a href="http://www.mensajeroweb.com.ar/index.php?x=nota/33861/1/mar-del-plata-no-quiere-cambiar-la-hora">
-# http://www.mensajeroweb.com.ar/index.php?x=nota/33861/1/mar-del-plata-no-quiere-cambiar-la-hora
-# </a>
-# English translation - "Mar del Plata is not to change the time"
+# So I guess a new set of rules, besides "Arg", must be made and the last
+# America/Argentina/San_Luis entries should change to use these...
#
-# or
-# (some English translation)
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_argentina07.html">
-# http://www.worldtimezone.com/dst_news/dst_news_argentina07.html
-# </a>
-
-# From Arthur David Olson (2009-09-22):
-# "Mar del Plata no quiere cambiar la hora" translates to
-# "Mar del Plata doesn't want to change the time"
-# (less definitive than "is not to").
+# I'm enclosing a patch that does what I say... regretfully, the San Luis
+# timezone must be called "WART/WARST" even when most of the time (like,
+# right now) WARST == ART... that is, since last Sunday, all the country
+# is using UTC-3, but in my patch, San Luis calls it "WARST" and the rest
+# of the country calls it "ART".
+# ...
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
#
@@ -560,6 +569,10 @@
-3:00 - ART
#
# San Luis (SL)
+
+Rule SanLuis 2008 max - Mar Sun>=8 0:00 0 -
+Rule SanLuis 2007 max - Oct Sun>=8 0:00 1:00 S
+
Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
-4:16:48 - CMT 1920 May
-4:00 - ART 1930 Dec
@@ -574,8 +587,7 @@
-3:00 - ART 2004 May 31
-4:00 - WART 2004 Jul 25
-3:00 Arg AR%sT 2008 Jan 21
- -3:00 - ART 2009 Mar 15
- -4:00 Arg WAR%sT
+ -4:00 SanLuis WAR%sT
#
# Santa Cruz (SC)
Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#31 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.710 2009/09/22 16:51:00 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.711 2009/10/27 10:47:58 kib Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -415,7 +415,7 @@
ucontext_t uc;
struct proc *p = td->td_proc;
struct trapframe *regs;
- const ucontext_t *ucp;
+ ucontext_t *ucp;
long rflags;
int cs, error, ret;
ksiginfo_t ksi;
@@ -478,7 +478,6 @@
td->td_pcb->pcb_fsbase = ucp->uc_mcontext.mc_fsbase;
td->td_pcb->pcb_gsbase = ucp->uc_mcontext.mc_gsbase;
- PROC_LOCK(p);
#if defined(COMPAT_43)
if (ucp->uc_mcontext.mc_onstack & 1)
td->td_sigstk.ss_flags |= SS_ONSTACK;
@@ -486,10 +485,7 @@
td->td_sigstk.ss_flags &= ~SS_ONSTACK;
#endif
- td->td_sigmask = ucp->uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
td->td_pcb->pcb_flags |= PCB_FULLCTX;
td->td_pcb->pcb_full_iret = 1;
return (EJUSTRETURN);
==== //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#9 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.23 2009/07/09 09:34:11 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.24 2009/10/27 10:47:58 kib Exp $");
#include "opt_compat.h"
@@ -244,10 +244,8 @@
if (ret == 0) {
ret = ia32_set_mcontext(td, &uc.uc_mcontext);
if (ret == 0) {
- SIG_CANTMASK(uc.uc_sigmask);
- PROC_LOCK(td->td_proc);
- td->td_sigmask = uc.uc_sigmask;
- PROC_UNLOCK(td->td_proc);
+ kern_sigprocmask(td, SIG_SETMASK,
+ &uc.uc_sigmask, NULL, 0);
}
}
}
@@ -273,10 +271,8 @@
if (ret == 0) {
ret = ia32_set_mcontext(td, &uc.uc_mcontext);
if (ret == 0) {
- SIG_CANTMASK(uc.uc_sigmask);
- PROC_LOCK(td->td_proc);
- td->td_sigmask = uc.uc_sigmask;
- PROC_UNLOCK(td->td_proc);
+ kern_sigprocmask(td, SIG_SETMASK,
+ &uc.uc_sigmask, NULL, 0);
}
}
}
@@ -544,9 +540,8 @@
} */ *uap;
{
struct ia32_ucontext4 uc;
- struct proc *p = td->td_proc;
struct trapframe *regs;
- const struct ia32_ucontext4 *ucp;
+ struct ia32_ucontext4 *ucp;
int cs, eflags, error;
ksiginfo_t ksi;
@@ -610,11 +605,7 @@
regs->tf_fs = ucp->uc_mcontext.mc_fs;
regs->tf_gs = ucp->uc_mcontext.mc_gs;
- PROC_LOCK(p);
- td->td_sigmask = ucp->uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
td->td_pcb->pcb_full_iret = 1;
return (EJUSTRETURN);
}
@@ -631,9 +622,8 @@
} */ *uap;
{
struct ia32_ucontext uc;
- struct proc *p = td->td_proc;
struct trapframe *regs;
- const struct ia32_ucontext *ucp;
+ struct ia32_ucontext *ucp;
int cs, eflags, error, ret;
ksiginfo_t ksi;
@@ -702,11 +692,7 @@
regs->tf_gs = ucp->uc_mcontext.mc_gs;
regs->tf_flags = TF_HASSEGS;
- PROC_LOCK(p);
- td->td_sigmask = ucp->uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
td->td_pcb->pcb_full_iret = 1;
return (EJUSTRETURN);
}
==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#16 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.53 2009/04/01 13:09:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.54 2009/10/28 20:17:54 jhb Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -91,6 +91,10 @@
return (bsa);
}
+static int linux_mmap_common(struct thread *td, l_uintptr_t addr,
+ l_size_t len, l_int prot, l_int flags, l_int fd,
+ l_loff_t pos);
+
int
bsd_to_linux_sigaltstack(int bsa)
{
@@ -759,12 +763,9 @@
#define STACK_SIZE (2 * 1024 * 1024)
#define GUARD_SIZE (4 * PAGE_SIZE)
-static int linux_mmap_common(struct thread *, struct l_mmap_argv *);
-
int
linux_mmap2(struct thread *td, struct linux_mmap2_args *args)
{
- struct l_mmap_argv linux_args;
#ifdef DEBUG
if (ldebug(mmap2))
@@ -773,14 +774,9 @@
args->flags, args->fd, args->pgoff);
#endif
- linux_args.addr = PTROUT(args->addr);
- linux_args.len = args->len;
- linux_args.prot = args->prot;
- linux_args.flags = args->flags;
- linux_args.fd = args->fd;
- linux_args.pgoff = args->pgoff;
-
- return (linux_mmap_common(td, &linux_args));
+ return (linux_mmap_common(td, PTROUT(args->addr), args->len, args->prot,
+ args->flags, args->fd, (uint64_t)(uint32_t)args->pgoff *
+ PAGE_SIZE));
}
int
@@ -799,15 +795,15 @@
linux_args.addr, linux_args.len, linux_args.prot,
linux_args.flags, linux_args.fd, linux_args.pgoff);
#endif
- if ((linux_args.pgoff % PAGE_SIZE) != 0)
- return (EINVAL);
- linux_args.pgoff /= PAGE_SIZE;
- return (linux_mmap_common(td, &linux_args));
+ return (linux_mmap_common(td, linux_args.addr, linux_args.len,
+ linux_args.prot, linux_args.flags, linux_args.fd,
+ (uint32_t)linux_args.pgoff));
}
static int
-linux_mmap_common(struct thread *td, struct l_mmap_argv *linux_args)
+linux_mmap_common(struct thread *td, l_uintptr_t addr, l_size_t len, l_int prot,
+ l_int flags, l_int fd, l_loff_t pos)
{
struct proc *p = td->td_proc;
struct mmap_args /* {
@@ -830,21 +826,20 @@
* Linux mmap(2):
* You must specify exactly one of MAP_SHARED and MAP_PRIVATE
*/
- if (! ((linux_args->flags & LINUX_MAP_SHARED) ^
- (linux_args->flags & LINUX_MAP_PRIVATE)))
+ if (!((flags & LINUX_MAP_SHARED) ^ (flags & LINUX_MAP_PRIVATE)))
return (EINVAL);
- if (linux_args->flags & LINUX_MAP_SHARED)
+ if (flags & LINUX_MAP_SHARED)
bsd_args.flags |= MAP_SHARED;
- if (linux_args->flags & LINUX_MAP_PRIVATE)
+ if (flags & LINUX_MAP_PRIVATE)
bsd_args.flags |= MAP_PRIVATE;
- if (linux_args->flags & LINUX_MAP_FIXED)
+ if (flags & LINUX_MAP_FIXED)
bsd_args.flags |= MAP_FIXED;
- if (linux_args->flags & LINUX_MAP_ANON)
+ if (flags & LINUX_MAP_ANON)
bsd_args.flags |= MAP_ANON;
else
bsd_args.flags |= MAP_NOSYNC;
- if (linux_args->flags & LINUX_MAP_GROWSDOWN)
+ if (flags & LINUX_MAP_GROWSDOWN)
bsd_args.flags |= MAP_STACK;
/*
@@ -852,12 +847,12 @@
* on Linux/i386. We do this to ensure maximum compatibility.
* Linux/ia64 does the same in i386 emulation mode.
*/
- bsd_args.prot = linux_args->prot;
+ bsd_args.prot = prot;
if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC))
bsd_args.prot |= PROT_READ | PROT_EXEC;
/* Linux does not check file descriptor when MAP_ANONYMOUS is set. */
- bsd_args.fd = (bsd_args.flags & MAP_ANON) ? -1 : linux_args->fd;
+ bsd_args.fd = (bsd_args.flags & MAP_ANON) ? -1 : fd;
if (bsd_args.fd != -1) {
/*
* Linux follows Solaris mmap(2) description:
@@ -882,7 +877,7 @@
fdrop(fp, td);
}
- if (linux_args->flags & LINUX_MAP_GROWSDOWN) {
+ if (flags & LINUX_MAP_GROWSDOWN) {
/*
* The Linux MAP_GROWSDOWN option does not limit auto
* growth of the region. Linux mmap with this option
@@ -905,8 +900,7 @@
* fixed size of (STACK_SIZE - GUARD_SIZE).
*/
- if ((caddr_t)PTRIN(linux_args->addr) + linux_args->len >
- p->p_vmspace->vm_maxsaddr) {
+ if ((caddr_t)PTRIN(addr) + len > p->p_vmspace->vm_maxsaddr) {
/*
* Some Linux apps will attempt to mmap
* thread stacks near the top of their
@@ -937,19 +931,19 @@
* we map the full stack, since we don't have a way
* to autogrow it.
*/
- if (linux_args->len > STACK_SIZE - GUARD_SIZE) {
- bsd_args.addr = (caddr_t)PTRIN(linux_args->addr);
- bsd_args.len = linux_args->len;
+ if (len > STACK_SIZE - GUARD_SIZE) {
+ bsd_args.addr = (caddr_t)PTRIN(addr);
+ bsd_args.len = len;
} else {
- bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) -
- (STACK_SIZE - GUARD_SIZE - linux_args->len);
+ bsd_args.addr = (caddr_t)PTRIN(addr) -
+ (STACK_SIZE - GUARD_SIZE - len);
bsd_args.len = STACK_SIZE - GUARD_SIZE;
}
} else {
- bsd_args.addr = (caddr_t)PTRIN(linux_args->addr);
- bsd_args.len = linux_args->len;
+ bsd_args.addr = (caddr_t)PTRIN(addr);
+ bsd_args.len = len;
}
- bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE;
+ bsd_args.pos = pos;
#ifdef DEBUG
if (ldebug(mmap))
==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#18 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.53 2009/08/24 16:19:47 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.54 2009/10/27 10:47:58 kib Exp $");
#include "opt_compat.h"
#ifndef COMPAT_IA32
@@ -565,9 +565,9 @@
int
linux_sigreturn(struct thread *td, struct linux_sigreturn_args *args)
{
- struct proc *p = td->td_proc;
struct l_sigframe frame;
struct trapframe *regs;
+ sigset_t bmask;
l_sigset_t lmask;
int eflags, i;
ksiginfo_t ksi;
@@ -623,11 +623,8 @@
lmask.__bits[0] = frame.sf_sc.sc_mask;
for (i = 0; i < (LINUX_NSIG_WORDS-1); i++)
lmask.__bits[i+1] = frame.sf_extramask[i];
- PROC_LOCK(p);
- linux_to_bsd_sigset(&lmask, &td->td_sigmask);
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ linux_to_bsd_sigset(&lmask, &bmask);
+ kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0);
/*
* Restore signal context.
@@ -666,9 +663,9 @@
int
linux_rt_sigreturn(struct thread *td, struct linux_rt_sigreturn_args *args)
{
- struct proc *p = td->td_proc;
struct l_ucontext uc;
struct l_sigcontext *context;
+ sigset_t bmask;
l_stack_t *lss;
stack_t ss;
struct trapframe *regs;
@@ -725,11 +722,8 @@
return(EINVAL);
}
- PROC_LOCK(p);
- linux_to_bsd_sigset(&uc.uc_sigmask, &td->td_sigmask);
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ linux_to_bsd_sigset(&uc.uc_sigmask, &bmask);
+ kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0);
/*
* Restore signal context
==== //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#13 (text+ko) ====
@@ -46,7 +46,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.33 2009/05/18 18:37:18 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.34 2009/10/27 10:47:58 kib Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -605,7 +605,6 @@
const struct __ucontext *sigcntxp;
} */ *uap;
{
- struct proc *p = td->td_proc;
struct sigframe sf;
struct trapframe *tf;
int spsr;
@@ -627,11 +626,7 @@
set_mcontext(td, &sf.sf_uc.uc_mcontext);
/* Restore signal mask. */
- PROC_LOCK(p);
- td->td_sigmask = sf.sf_uc.uc_sigmask;
- SIG_CANTMASK(td->td_sigmask);
- signotify(td);
- PROC_UNLOCK(p);
+ kern_sigprocmask(td, SIG_SETMASK, &sf.sf_uc.uc_sigmask, NULL, 0);
return (EJUSTRETURN);
}
==== //depot/projects/scottl-camlock/src/sys/boot/common/commands.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.22 2004/11/13 17:04:55 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.23 2009/10/28 10:06:27 brueffer Exp $");
#include <stand.h>
#include <string.h>
@@ -150,6 +150,7 @@
break;
default:
command_errmsg = "usage is 'help <topic> [<subtopic>]";
+ close(hfd);
return(CMD_ERROR);
}
==== //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#22 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.94 2009/09/09 20:59:01 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.97 2009/10/27 10:55:34 kib Exp $");
#include "opt_compat.h"
#include "opt_inet.h"
@@ -593,6 +593,41 @@
sizeof(int32_t) * 8));
}
+int
+freebsd32_pselect(struct thread *td, struct freebsd32_pselect_args *uap)
+{
+ struct timespec32 ts32;
+ struct timespec ts;
+ struct timeval tv, *tvp;
+ sigset_t set, *uset;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list