Re: svn commit: r211501 - in head/sys: modules modules/send netinet netinet6 sys
On Mon, Aug 23, 2010 at 12:32:33AM -0600, Scott Long wrote: > Doug, you're being a grade-A asshole in this entire discussion. The > merits of your argument are being completely overshadowed by your > patronizing attitude and over the top straw-man extremism. Ana deserves > an apology from you, and you would do well to consider apologizing to > everyone involved. Guys, I think you all are being too hard on Doug. Let me quote this part of article I recently came across at Undeadly: "When people actually care about something, they tend to have strong opinions. When you are wrong, you hear about it, very directly and in no uncertain terms. Absolutely no one is given special treatment. You have a choice between being offended and leaving, or appreciating the criticism and trying to do better. The people who get offended are the ones who have missed the obvious; another person just gave you their time in writing out their opinion and correction. They may have skipped showering you with sunshine, rainbows and ponies, but how you feel is unimportant. The thing that matters is the thing they care about, the best way to do it." -- http://undeadly.org/cgi?action=article&sid=20100721125722 That said, I wish we all grow a thiker skin and start actually value the criticism like we did in the old days. ./danfe ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r211609 - head/tools/regression/bin/sh/builtins
On Sun, 22 Aug 2010 11:04:30 + (UTC) Jilles Tjoelker
wrote:
> Author: jilles
> Date: Sun Aug 22 11:04:30 2010
> New Revision: 211609
> URL: http://svn.freebsd.org/changeset/base/211609
>
> Log:
> sh: Add a test for breaking from a loop outside the current function.
>
> It is unwise to rely on this but I'd like to know if this would break.
>
> Added:
> head/tools/regression/bin/sh/builtins/break3.0 (contents, props changed)
>
> Added: head/tools/regression/bin/sh/builtins/break3.0
> ==
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/tools/regression/bin/sh/builtins/break3.0Sun Aug 22 11:04:30
> 2010(r211609)
> @@ -0,0 +1,15 @@
> +# $FreeBSD$
> +
> +# We accept this and people might rely on it.
> +# However, various other shells do not accept it.
> +
> +f() {
> + break
> + echo bad1
> +}
> +
> +while :; do
> + f
> + echo bad2
> + exit 2
> +done
This feature should be counted as a bug IMHO. How can f() possibly know whether
there's a surrounding context to break from?
Having said that, this behaviour is the same in bash except that bash will
complain if
it's asked to break when the context is wrong, perhaps we should complain too?
$ bash -c 'f() { break; echo no break; }; for f in good bad; do echo $f; f;
done'
good
$ sh -c 'f() { break; echo no break; }; for f in good bad; do echo $f; f; done'
good
$ bash -c 'f() { break; echo no break; }; f'
bash: line 0: break: only meaningful in a `for', `while', or `until' loop
no break
$ bash -c 'f() { break 2>/dev/null; echo no break; }; f'
no break
$ sh -c 'f() { break; echo no break; }; f'
no break
--
Brian Somers
Don't _EVER_ lose your sense of humour !
signature.asc
Description: PGP signature
Re: svn commit: r211501 - in head/sys: modules modules/send netinet netinet6 sys
Just to be clear, I never meant any disrespect to Ana personally, and if anything I said was or could have been construed that way, for that I definitely do apologize. On 8/23/2010 12:00 AM, Alexey Dokuchaev wrote: On Mon, Aug 23, 2010 at 12:32:33AM -0600, Scott Long wrote: Doug, you're being a grade-A asshole in this entire discussion. The merits of your argument are being completely overshadowed by your patronizing attitude and over the top straw-man extremism. Ana deserves an apology from you, and you would do well to consider apologizing to everyone involved. Guys, I think you all are being too hard on Doug. Not only might you be the first FreeBSD person to ever say that, you're definitely the first to say it publicly. :) I really liked your quote, and you are correct in thinking that I do care deeply about this issue specifically, and the issue of making FreeBSD better generally. However neither my motivations, nor the extent to which I felt ill-treated by some in this thread excuse my over-the-top behavior, and for that I also apologize. Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover!http://SupersetSolutions.com/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r211304 - head/lib/libutil
Dimitry Andric writes: > Dag-Erling Smørgrav writes: > > Bruce Cran writes: > > > Somewhat related, there are overflow bugs in humanize_number - for > > > example df(1) fails to display space from a 100PB filesystem > > > correctly. > > Patch? :) > Attached. This makes humanize_number() work properly for all possible > int64_t values. That's awesome! Any way I can convince you to fix expand_number() as well? I got a detailed explanation of what's wrong with it (both before and after my commits) from bde@ (cc:ed) in private correspondence; I can forward it to you if he doesn't mind. DES -- Dag-Erling Smørgrav - d...@des.no ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211699 - stable/8/usr.sbin/newsyslog
Author: brian Date: Mon Aug 23 09:52:04 2010 New Revision: 211699 URL: http://svn.freebsd.org/changeset/base/211699 Log: MFC r210407: Add a -S switch to override syslogd's pidfile. Modified: stable/8/usr.sbin/newsyslog/newsyslog.8 stable/8/usr.sbin/newsyslog/newsyslog.c stable/8/usr.sbin/newsyslog/newsyslog.conf.5 Directory Properties: stable/8/usr.sbin/newsyslog/ (props changed) Modified: stable/8/usr.sbin/newsyslog/newsyslog.8 == --- stable/8/usr.sbin/newsyslog/newsyslog.8 Mon Aug 23 06:40:21 2010 (r211698) +++ stable/8/usr.sbin/newsyslog/newsyslog.8 Mon Aug 23 09:52:04 2010 (r211699) @@ -17,7 +17,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd January 19, 2010 +.Dd July 23, 2010 .Dt NEWSYSLOG 8 .Os .Sh NAME @@ -27,6 +27,7 @@ .Nm .Op Fl CFNPnrsv .Op Fl R Ar tagname +.Op Fl S Ar pidfile .Op Fl a Ar directory .Op Fl d Ar directory .Op Fl f Ar config_file @@ -215,6 +216,12 @@ Skipping the signal step will also mean will return faster, since .Nm normally waits a few seconds after any signal that is sent. +.It Fl S Ar pidfile +Use +.Ar pidfile +as +.Xr syslogd 8 Ns 's +pidfile. .El .Pp If additional command line arguments are given, Modified: stable/8/usr.sbin/newsyslog/newsyslog.c == --- stable/8/usr.sbin/newsyslog/newsyslog.c Mon Aug 23 06:40:21 2010 (r211698) +++ stable/8/usr.sbin/newsyslog/newsyslog.c Mon Aug 23 09:52:04 2010 (r211699) @@ -186,6 +186,8 @@ char daytime[DAYTIME_LEN]; /* The curren * used for rotation-tracking messages. */ char hostname[MAXHOSTNAMELEN]; /* hostname */ +const char *path_syslogpid = _PATH_SYSLOGPID; + static struct conf_entry *get_worklist(char **files); static void parse_file(FILE *cf, const char *cfname, struct conf_entry **work_p, struct conf_entry **glob_p, struct conf_entry **defconf_p); @@ -632,6 +634,9 @@ parse_args(int argc, char **argv) rotatereq++; requestor = strdup(optarg); break; + case 'S': + path_syslogpid = optarg; + break; case 'm': /* Used by OpenBSD for "monitor mode" */ default: usage(); @@ -724,7 +729,7 @@ usage(void) fprintf(stderr, "usage: newsyslog [-CFNnrsv] [-a directory] [-d directory] [-f config-file]\n" - " [ [-R requestor] filename ... ]\n"); + " [-S pidfile] [ [-R requestor] filename ... ]\n"); exit(1); } @@ -1318,7 +1323,7 @@ no_trimat: working->flags &= ~CE_SIGNALGROUP; } if (needroot) - working->pid_file = strdup(_PATH_SYSLOGPID); + working->pid_file = strdup(path_syslogpid); } /* Modified: stable/8/usr.sbin/newsyslog/newsyslog.conf.5 == --- stable/8/usr.sbin/newsyslog/newsyslog.conf.5Mon Aug 23 06:40:21 2010(r211698) +++ stable/8/usr.sbin/newsyslog/newsyslog.conf.5Mon Aug 23 09:52:04 2010(r211699) @@ -21,7 +21,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd November 27, 2006 +.Dd July 23, 2010 .Dt NEWSYSLOG.CONF 5 .Os .Sh NAME @@ -315,14 +315,17 @@ process ID or to find a group process ID flag was specified. If this field is present, a .Ar signal_number -is sent the process ID contained in this file. -If this field is not present, then a +is sent to the process ID contained in this file. +If this field is not present and the +.Cm N +flag has not been specified, then a .Dv SIGHUP signal will be sent to -.Xr syslogd 8 , -unless the -.Cm N -flag has been specified. +.Xr syslogd 8 +or to the process id found in the file specified by +.Xr newsyslog 8 Ns 's +.Fl S +switch. This field must start with .Ql / in order to be recognized properly. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211700 - stable/7/usr.sbin/newsyslog
Author: brian Date: Mon Aug 23 09:54:32 2010 New Revision: 211700 URL: http://svn.freebsd.org/changeset/base/211700 Log: MFC r210407: Add a -S switch to override syslogd's pidfile. Modified: stable/7/usr.sbin/newsyslog/newsyslog.8 stable/7/usr.sbin/newsyslog/newsyslog.c stable/7/usr.sbin/newsyslog/newsyslog.conf.5 Directory Properties: stable/7/usr.sbin/newsyslog/ (props changed) Modified: stable/7/usr.sbin/newsyslog/newsyslog.8 == --- stable/7/usr.sbin/newsyslog/newsyslog.8 Mon Aug 23 09:52:04 2010 (r211699) +++ stable/7/usr.sbin/newsyslog/newsyslog.8 Mon Aug 23 09:54:32 2010 (r211700) @@ -17,7 +17,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd January 19, 2010 +.Dd July 23, 2010 .Dt NEWSYSLOG 8 .Os .Sh NAME @@ -27,6 +27,7 @@ .Nm .Op Fl CFNPnrsv .Op Fl R Ar tagname +.Op Fl S Ar pidfile .Op Fl a Ar directory .Op Fl d Ar directory .Op Fl f Ar config_file @@ -215,6 +216,12 @@ Skipping the signal step will also mean will return faster, since .Nm normally waits a few seconds after any signal that is sent. +.It Fl S Ar pidfile +Use +.Ar pidfile +as +.Xr syslogd 8 Ns 's +pidfile. .El .Pp If additional command line arguments are given, Modified: stable/7/usr.sbin/newsyslog/newsyslog.c == --- stable/7/usr.sbin/newsyslog/newsyslog.c Mon Aug 23 09:52:04 2010 (r211699) +++ stable/7/usr.sbin/newsyslog/newsyslog.c Mon Aug 23 09:54:32 2010 (r211700) @@ -186,6 +186,8 @@ char daytime[DAYTIME_LEN]; /* The curren * used for rotation-tracking messages. */ char hostname[MAXHOSTNAMELEN]; /* hostname */ +const char *path_syslogpid = _PATH_SYSLOGPID; + static struct conf_entry *get_worklist(char **files); static void parse_file(FILE *cf, const char *cfname, struct conf_entry **work_p, struct conf_entry **glob_p, struct conf_entry **defconf_p); @@ -632,6 +634,9 @@ parse_args(int argc, char **argv) rotatereq++; requestor = strdup(optarg); break; + case 'S': + path_syslogpid = optarg; + break; case 'm': /* Used by OpenBSD for "monitor mode" */ default: usage(); @@ -724,7 +729,7 @@ usage(void) fprintf(stderr, "usage: newsyslog [-CFNnrsv] [-a directory] [-d directory] [-f config-file]\n" - " [ [-R requestor] filename ... ]\n"); + " [-S pidfile] [ [-R requestor] filename ... ]\n"); exit(1); } @@ -1318,7 +1323,7 @@ no_trimat: working->flags &= ~CE_SIGNALGROUP; } if (needroot) - working->pid_file = strdup(_PATH_SYSLOGPID); + working->pid_file = strdup(path_syslogpid); } /* Modified: stable/7/usr.sbin/newsyslog/newsyslog.conf.5 == --- stable/7/usr.sbin/newsyslog/newsyslog.conf.5Mon Aug 23 09:52:04 2010(r211699) +++ stable/7/usr.sbin/newsyslog/newsyslog.conf.5Mon Aug 23 09:54:32 2010(r211700) @@ -21,7 +21,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd November 27, 2006 +.Dd July 23, 2010 .Dt NEWSYSLOG.CONF 5 .Os .Sh NAME @@ -315,14 +315,17 @@ process ID or to find a group process ID flag was specified. If this field is present, a .Ar signal_number -is sent the process ID contained in this file. -If this field is not present, then a +is sent to the process ID contained in this file. +If this field is not present and the +.Cm N +flag has not been specified, then a .Dv SIGHUP signal will be sent to -.Xr syslogd 8 , -unless the -.Cm N -flag has been specified. +.Xr syslogd 8 +or to the process id found in the file specified by +.Xr newsyslog 8 Ns 's +.Fl S +switch. This field must start with .Ql / in order to be recognized properly. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211701 - in head: gnu/usr.bin share/mk sys/sys tools/build/options usr.bin
Author: gabor
Date: Mon Aug 23 10:04:26 2010
New Revision: 211701
URL: http://svn.freebsd.org/changeset/base/211701
Log:
- Change default grep back to GNU version. BSD grep can be built with the
WITH_BSD_GREP knob.
- Bump __FreeBSD_version
Requested by: dougb
Approved by:delphij (mentor)
Added:
head/tools/build/options/WITH_BSD_GREP (contents, props changed)
Deleted:
head/tools/build/options/WITH_GNU_GREP
Modified:
head/gnu/usr.bin/Makefile
head/share/mk/bsd.own.mk
head/sys/sys/param.h
head/usr.bin/Makefile
Modified: head/gnu/usr.bin/Makefile
==
--- head/gnu/usr.bin/Makefile Mon Aug 23 09:54:32 2010(r211700)
+++ head/gnu/usr.bin/Makefile Mon Aug 23 10:04:26 2010(r211701)
@@ -28,6 +28,10 @@ _groff= groff
.endif
.endif
+.if ${MK_BSD_GREP} != "yes"
+_grep= grep
+.endif
+
.if ${MK_CVS} != "no"
_cvs= cvs
.endif
@@ -36,10 +40,6 @@ _cvs=cvs
_dtc= dtc
.endif
-.if ${MK_GNU_GREP} != "no"
-_grep= grep
-.endif
-
.if ${MK_INFO} != "no"
_texinfo= texinfo
.endif
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkMon Aug 23 09:54:32 2010(r211700)
+++ head/share/mk/bsd.own.mkMon Aug 23 10:04:26 2010(r211701)
@@ -419,9 +419,9 @@ MK_${var}:= yes
BIND_LIBS \
BIND_SIGCHASE \
BIND_XML \
+BSD_GREP \
${_clang_no} \
FDT \
-GNU_GREP \
HESIOD \
IDEA
.if defined(WITH_${var}) && defined(WITHOUT_${var})
Modified: head/sys/sys/param.h
==
--- head/sys/sys/param.hMon Aug 23 09:54:32 2010(r211700)
+++ head/sys/sys/param.hMon Aug 23 10:04:26 2010(r211701)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 900016 /* Master, propagated to newvers */
+#define __FreeBSD_version 900017 /* Master, propagated to newvers */
#ifndef LOCORE
#include
Added: head/tools/build/options/WITH_BSD_GREP
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITH_BSD_GREP Mon Aug 23 10:04:26 2010
(r211701)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Build BSD-licensed grep instead of GNU grep.
Modified: head/usr.bin/Makefile
==
--- head/usr.bin/Makefile Mon Aug 23 09:54:32 2010(r211700)
+++ head/usr.bin/Makefile Mon Aug 23 10:04:26 2010(r211701)
@@ -277,6 +277,10 @@ _bluetooth=bluetooth
_cpio= cpio
.endif
+.if ${MK_BSD_GREP} != "no"
+_grep= grep
+.endif
+
.if ${MK_CALENDAR} != "no"
_calendar= calendar
.endif
@@ -285,10 +289,6 @@ _calendar= calendar
_clang=clang
.endif
-.if ${MK_GNU_GREP} != "yes"
-_grep= grep
-.endif
-
.if ${MK_HESIOD} != "no"
_hesinfo= hesinfo
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r211701 - in head: gnu/usr.bin share/mk sys/sys tools/build/options usr.bin
Is this a permanent switch or is there a list of issues to be resolved before
switching
back to the BSD grep?
On Mon, 23 Aug 2010 10:04:26 + (UTC) Gabor Kovesdan
wrote:
> Author: gabor
> Date: Mon Aug 23 10:04:26 2010
> New Revision: 211701
> URL: http://svn.freebsd.org/changeset/base/211701
>
> Log:
> - Change default grep back to GNU version. BSD grep can be built with the
> WITH_BSD_GREP knob.
> - Bump __FreeBSD_version
>
> Requested by: dougb
> Approved by:delphij (mentor)
>
> Added:
> head/tools/build/options/WITH_BSD_GREP (contents, props changed)
> Deleted:
> head/tools/build/options/WITH_GNU_GREP
> Modified:
> head/gnu/usr.bin/Makefile
> head/share/mk/bsd.own.mk
> head/sys/sys/param.h
> head/usr.bin/Makefile
>
> Modified: head/gnu/usr.bin/Makefile
> ==
> --- head/gnu/usr.bin/Makefile Mon Aug 23 09:54:32 2010(r211700)
> +++ head/gnu/usr.bin/Makefile Mon Aug 23 10:04:26 2010(r211701)
> @@ -28,6 +28,10 @@ _groff=groff
> .endif
> .endif
>
> +.if ${MK_BSD_GREP} != "yes"
> +_grep= grep
> +.endif
> +
> .if ${MK_CVS} != "no"
> _cvs=cvs
> .endif
> @@ -36,10 +40,6 @@ _cvs= cvs
> _dtc=dtc
> .endif
>
> -.if ${MK_GNU_GREP} != "no"
> -_grep= grep
> -.endif
> -
> .if ${MK_INFO} != "no"
> _texinfo=texinfo
> .endif
>
> Modified: head/share/mk/bsd.own.mk
> ==
> --- head/share/mk/bsd.own.mk Mon Aug 23 09:54:32 2010(r211700)
> +++ head/share/mk/bsd.own.mk Mon Aug 23 10:04:26 2010(r211701)
> @@ -419,9 +419,9 @@ MK_${var}:= yes
> BIND_LIBS \
> BIND_SIGCHASE \
> BIND_XML \
> +BSD_GREP \
> ${_clang_no} \
> FDT \
> -GNU_GREP \
> HESIOD \
> IDEA
> .if defined(WITH_${var}) && defined(WITHOUT_${var})
>
> Modified: head/sys/sys/param.h
> ==
> --- head/sys/sys/param.h Mon Aug 23 09:54:32 2010(r211700)
> +++ head/sys/sys/param.h Mon Aug 23 10:04:26 2010(r211701)
> @@ -58,7 +58,7 @@
> * in the range 5 to 9.
> */
> #undef __FreeBSD_version
> -#define __FreeBSD_version 900016 /* Master, propagated to newvers */
> +#define __FreeBSD_version 900017 /* Master, propagated to newvers */
>
> #ifndef LOCORE
> #include
>
> Added: head/tools/build/options/WITH_BSD_GREP
> ==
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/tools/build/options/WITH_BSD_GREPMon Aug 23 10:04:26 2010
> (r211701)
> @@ -0,0 +1,2 @@
> +.\" $FreeBSD$
> +Build BSD-licensed grep instead of GNU grep.
>
> Modified: head/usr.bin/Makefile
> ==
> --- head/usr.bin/Makefile Mon Aug 23 09:54:32 2010(r211700)
> +++ head/usr.bin/Makefile Mon Aug 23 10:04:26 2010(r211701)
> @@ -277,6 +277,10 @@ _bluetooth= bluetooth
> _cpio= cpio
> .endif
>
> +.if ${MK_BSD_GREP} != "no"
> +_grep= grep
> +.endif
> +
> .if ${MK_CALENDAR} != "no"
> _calendar= calendar
> .endif
> @@ -285,10 +289,6 @@ _calendar= calendar
> _clang= clang
> .endif
>
> -.if ${MK_GNU_GREP} != "yes"
> -_grep= grep
> -.endif
> -
> .if ${MK_HESIOD} != "no"
> _hesinfo=hesinfo
> .endif
>
--
Brian Somers
Don't _EVER_ lose your sense of humour !
signature.asc
Description: PGP signature
Re: svn commit: r211701 - in head: gnu/usr.bin share/mk sys/sys tools/build/options usr.bin
On 23-08-2010 10:04, Gabor Kovesdan wrote: > Author: gabor > Date: Mon Aug 23 10:04:26 2010 > New Revision: 211701 > URL: http://svn.freebsd.org/changeset/base/211701 > > Log: > - Change default grep back to GNU version. BSD grep can be built with the > WITH_BSD_GREP knob. :-( -- Joel ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r211684 - head/sys/kern
On Mon, Aug 23, 2010 at 05:33:31AM +, Brian Somers wrote: > Author: brian > Date: Mon Aug 23 05:33:31 2010 > New Revision: 211684 > URL: http://svn.freebsd.org/changeset/base/211684 > > Log: > uio_resid isn't updated by VOP_READDIR for nfs filesystems. Use > the uio_offset adjustment instead to calculate a correct *len. Isn't this should be fixed in nfs instead ? Please note that the moral equivalent of the code is also present in compat/linux/linux_cwd.c: linux_getcwd_scandir(). I did not inspected other callers of VOP_READDIR. > > Without this change, we run off the end of the directory data > we're reading and panic horribly for nfs filesystems. > > MFC after: 1 week > > Modified: > head/sys/kern/vfs_default.c > > Modified: head/sys/kern/vfs_default.c > == > --- head/sys/kern/vfs_default.c Mon Aug 23 05:33:20 2010 > (r211683) > +++ head/sys/kern/vfs_default.c Mon Aug 23 05:33:31 2010 > (r211684) > @@ -281,10 +281,9 @@ get_next_dirent(struct vnode *vp, struct > if (error) > return (error); > > - *off = uio.uio_offset; > - > *cpos = dirbuf; > - *len = (dirbuflen - uio.uio_resid); > + *len = uio.uio_offset - *off; > + *off = uio.uio_offset; > } > > dp = (struct dirent *)(*cpos); pgpURXVhv5vEw.pgp Description: PGP signature
Re: svn commit: r211701 - in head: gnu/usr.bin share/mk sys/sys tools/build/options usr.bin
Em 2010.08.23. 12:12, Brian Somers escreveu: Is this a permanent switch or is there a list of issues to be resolved before switching back to the BSD grep? I maintain my TODO list, which currently has the following items: - fix context grepping bug - fix loop on reading drectories on ZFS/NFS - print out warning and exit if writing to stdin fails - track down and fix -wq bug - support and install bz*grep binaries - performance issue: avoid copying strings everywhere where possible - performance issue: only check line boundaries on match - performance issue: compare various fixed string algorithms for fgrep Some of these are quite easy and the performance is much better now but some people objected so strongly that I decided to stop fighting and change back. I'll work these out and then we'll reevaluate if we can use BSD grep as default. I'll try to get them solved asap but I'll move to another country soon and given that I as forced to change it back without having some more time to arrange them, I don't like to be stressed any more so I'll concentrate on my move and calm settlement in Portugal, first. Gabor ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r211701 - in head: gnu/usr.bin share/mk sys/sys tools/build/options usr.bin
On 2010-08-23 12:31, Gabor Kovesdan wrote: > - print out warning and exit if writing to stdin fails I hope you mean stdout here? :) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r211695 - head/sys/kern
On 23 Aug 2010, at 07:32, pluknet wrote:
> On 23 August 2010 10:22, Warner Losh wrote:
>> Author: imp
>> Date: Mon Aug 23 06:22:35 2010
>> New Revision: 211695
>> URL: http://svn.freebsd.org/changeset/base/211695
>>
>> Log:
>> This should really be MACHINE not MACHINE_ARCH, and is this Makefile even
>> used?
>>
>
> Hi.
>
> I wrote this letter almost 2.5y ago with no response.
> Hope this helps.
>
> %%%
> I looked at sys/kern/ Makefile Make.tags.inc. AFAICS they were partially
> abandoned years ago and has broken tags support and even contain 4.4BSD-Lite
> paths, that never ever being in FreeBSD CVS or was dropped years ago. So make
> links exits with error. It looks very odd:
>
> pl$ make links
> rm -f /var/db/sys_tags
> ln -s /sys/i386/tags /var/db/sys_tags
> for i in conf dev dev/scsi fs fs/deadfs fs/fdescfs fs/fifofs
> fs/lofs fs/nullfs fs/portalfs fs/procfs fs/specfs fs/unionfs hp
> hp/dev hp/hpux kern libkern net netinet nfs scripts sys ufs ufs/ffs
> ufs/lfs ufs/ufs vm; do (cd ../$i && { rm -f tags; ln -s
> /var/db/sys_tags tags; }) done
> cd: can't cd to ../dev/scsi
> cd: can't cd to ../fs/lofs
> cd: can't cd to ../fs/specfs
> cd: can't cd to ../hp
> cd: can't cd to ../hp/dev
> cd: can't cd to ../hp/hpux
> cd: can't cd to ../scripts
> cd: can't cd to ../ufs/lfs
> for i in i386; do (cd ../$i && make SYSTAGS=/var/db/sys_tags links); done
> for i in /sys/conf /sys/kern /sys/net /sys/netatalk /sys/netatm
> /sys/netinet /sys/netinet6 /sys/netipsec /sys/netipx /sys/netnatm
> /sys/nfs /sys/pci /sys/vm /sys/sys; do (cd $i && { rm -f tags; ln
> -s ../i386/tags tags; }) done
> for i in /sys/dev/advansys /sys/dev/aha /sys/dev/aic7xxx
> /sys/dev/buslogic /sys/dev/ccd /sys/dev/dec /sys/dev/dpt
> /sys/dev/en /sys/dev/hea /sys/dev/hfa /sys/dev/iicbus /sys/dev/isp
> /sys/dev/pdq /sys/dev/ppbus /sys/dev/smbus /sys/dev/vn
> /sys/dev/vx /sys/fs/deadfs /sys/fs/devfs /sys/fs/fdescfs
> /sys/fs/fifofs /sys/fs/msdosfs /sys/fs/nullfs /sys/fs/portalfs
> /sys/fs/procfs /sys
> /fs/specfs /sys/fs/unionfs /sys/fs/cd9660 /sys/ufs/ffs
> /sys/ufs/ufs; do (cd $i && { rm -f tags; ln -s ../../i386/tags tags;
> }) done
> cd: can't cd to /sys/dev/ccd
> cd: can't cd to /sys/dev/dec
> cd: can't cd to /sys/dev/hea
> cd: can't cd to /sys/dev/vn
> cd: can't cd to /sys/fs/specfs
> for i in apm i386 ibcs2 include isa linux; do (cd $i && { rm -f tags;
> ln -s ../tags tags; }) done
> cd: can't cd to apm
>
> I moved that two files from src and could complete build kernel
> without errors, so it
> seems they are not referenced by any kernel building tools.
>
> Yes, there is tags target in src/Makefile, I didn't looked too much
> how it interacts with Makefile Make.tags.inc, but by their erroneous
> paths I doubt there is any interaction.
>
> I found this in NetBSD's kern/Makefile:
> +# XXX
> +# [Note by Perry Metzger, Sept. 1998]
> +# As it stands, the tags support below is hopelessly
> +# broken. Just look at the names of the architectures it is dealing
> +# with and where it expects to find the support for them to see why.
> +# I've left the stuff in this Makefile alone in the hope that someone
> +# will fix it someday -- I am assuming that it might help that
> +# person if they have the old Makefile goo left in place as a starting
> +# point.
> +# XXX
>
> ps. BTW I tried to make tags from src/ (with clean obj, if that
> matters) and the target
> began to build my gcc (cc/cc_tools) after going through various world paths.
> Is that intended?
> %%%
Oh, this is great thing to axe then...
Regards,
--
Rui Paulo
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211702 - in stable: 7/contrib/bsnmp/gensnmpdef 7/contrib/bsnmp/gensnmptree 7/contrib/bsnmp/lib 7/contrib/bsnmp/snmp_mibII 7/contrib/bsnmp/snmpd 8/contrib/bsnmp/gensnmpdef 8/contrib/bsn...
Author: uqs Date: Mon Aug 23 11:58:45 2010 New Revision: 211702 URL: http://svn.freebsd.org/changeset/base/211702 Log: MFC r205078,208483,211401-211402,211404: mdoc cleanup - Fix typo in macro name and macro usage. - Consistently spell our email addresses - Wordsmithing of bsnmpd.1; bump .Dd - Fix two minor typos. Modified: stable/8/contrib/bsnmp/gensnmpdef/gensnmpdef.1 stable/8/contrib/bsnmp/gensnmptree/gensnmptree.1 stable/8/contrib/bsnmp/lib/asn1.3 stable/8/contrib/bsnmp/lib/bsnmpagent.3 stable/8/contrib/bsnmp/lib/bsnmpclient.3 stable/8/contrib/bsnmp/lib/bsnmplib.3 stable/8/contrib/bsnmp/snmp_mibII/snmp_mibII.3 stable/8/contrib/bsnmp/snmpd/bsnmpd.1 stable/8/contrib/bsnmp/snmpd/snmpmod.3 Directory Properties: stable/8/contrib/bsnmp/ (props changed) Changes in other areas also in this revision: Modified: stable/7/contrib/bsnmp/gensnmpdef/gensnmpdef.1 stable/7/contrib/bsnmp/gensnmptree/gensnmptree.1 stable/7/contrib/bsnmp/lib/asn1.3 stable/7/contrib/bsnmp/lib/bsnmpagent.3 stable/7/contrib/bsnmp/lib/bsnmpclient.3 stable/7/contrib/bsnmp/lib/bsnmplib.3 stable/7/contrib/bsnmp/snmp_mibII/snmp_mibII.3 stable/7/contrib/bsnmp/snmpd/bsnmpd.1 stable/7/contrib/bsnmp/snmpd/snmpmod.3 Directory Properties: stable/7/contrib/bsnmp/ (props changed) Modified: stable/8/contrib/bsnmp/gensnmpdef/gensnmpdef.1 == --- stable/8/contrib/bsnmp/gensnmpdef/gensnmpdef.1 Mon Aug 23 10:04:26 2010(r211701) +++ stable/8/contrib/bsnmp/gensnmpdef/gensnmpdef.1 Mon Aug 23 11:58:45 2010(r211702) @@ -3,7 +3,7 @@ .\"Hartmut Brandt. .\"All rights reserved. .\" -.\" Author: Harti Brandt +.\" Author: Harti Brandt .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -78,7 +78,7 @@ file by hand. .Sh SEE ALSO .Xr snmpd 1 .Sh AUTHORS -.An Hartmut Brandt Aq ha...@freebsd.org +.An Hartmut Brandt Aq ha...@freebsd.org .Sh BUGS The utility is by no means bullet-proof and may fail for complex or non-standard MIBs. Modified: stable/8/contrib/bsnmp/gensnmptree/gensnmptree.1 == --- stable/8/contrib/bsnmp/gensnmptree/gensnmptree.1Mon Aug 23 10:04:26 2010(r211701) +++ stable/8/contrib/bsnmp/gensnmptree/gensnmptree.1Mon Aug 23 11:58:45 2010(r211702) @@ -6,7 +6,7 @@ .\"Hartmut Brandt .\"All rights reserved. .\" -.\" Author: Harti Brandt +.\" Author: Harti Brandt .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -58,7 +58,7 @@ If none of the options .Fl e , .Fl E or -.FL t +.Fl t are used .Nm reads a MIB description from its standard input and creates two files: a @@ -243,4 +243,4 @@ typedef AdminStatus ENUM ( .Sh SEE ALSO .Xr bsnmpd 1 .Sh AUTHORS -.An Hartmut Brandt Aq ha...@freebsd.org +.An Hartmut Brandt Aq ha...@freebsd.org Modified: stable/8/contrib/bsnmp/lib/asn1.3 == --- stable/8/contrib/bsnmp/lib/asn1.3 Mon Aug 23 10:04:26 2010 (r211701) +++ stable/8/contrib/bsnmp/lib/asn1.3 Mon Aug 23 11:58:45 2010 (r211702) @@ -6,7 +6,7 @@ .\"Fraunhofer Institute for Open Communication Systems (FhG Fokus). .\"All rights reserved. .\" -.\" Author: Harti Brandt +.\" Author: Harti Brandt .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -489,4 +489,4 @@ followed by the error message and an opt This implementation conforms to the applicable IETF RFCs and ITU-T recommendations. .Sh AUTHORS -.An Hartmut Brandt Aq ha...@freebsd.org +.An Hartmut Brandt Aq ha...@freebsd.org Modified: stable/8/contrib/bsnmp/lib/bsnmpagent.3 == --- stable/8/contrib/bsnmp/lib/bsnmpagent.3 Mon Aug 23 10:04:26 2010 (r211701) +++ stable/8/contrib/bsnmp/lib/bsnmpagent.3 Mon Aug 23 11:58:45 2010 (r211702) @@ -6,7 +6,7 @@ .\"Fraunhofer Institute for Open Communication Systems (FhG Fokus). .\"All rights reserved. .\" -.\" Author: Harti Brandt +.\" Author: Harti Brandt .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -441,4 +441,4 @@ Additionally the functions may call snmp This implementation conforms to the applicable IETF RFCs and ITU-T recommendations. .Sh AUTHORS -.An Hartmut Brandt Aq ha...@freebsd.org +.An Hartmut Brandt Aq ha...@freebsd.org Modified: stable/8/contrib/bsnmp/lib/bsnmpclient.3 ==
svn commit: r211702 - in stable: 7/contrib/bsnmp/gensnmpdef 7/contrib/bsnmp/gensnmptree 7/contrib/bsnmp/lib 7/contrib/bsnmp/snmp_mibII 7/contrib/bsnmp/snmpd 8/contrib/bsnmp/gensnmpdef 8/contrib/bsn...
Author: uqs Date: Mon Aug 23 11:58:45 2010 New Revision: 211702 URL: http://svn.freebsd.org/changeset/base/211702 Log: MFC r205078,208483,211401-211402,211404: mdoc cleanup - Fix typo in macro name and macro usage. - Consistently spell our email addresses - Wordsmithing of bsnmpd.1; bump .Dd - Fix two minor typos. Modified: stable/7/contrib/bsnmp/gensnmpdef/gensnmpdef.1 stable/7/contrib/bsnmp/gensnmptree/gensnmptree.1 stable/7/contrib/bsnmp/lib/asn1.3 stable/7/contrib/bsnmp/lib/bsnmpagent.3 stable/7/contrib/bsnmp/lib/bsnmpclient.3 stable/7/contrib/bsnmp/lib/bsnmplib.3 stable/7/contrib/bsnmp/snmp_mibII/snmp_mibII.3 stable/7/contrib/bsnmp/snmpd/bsnmpd.1 stable/7/contrib/bsnmp/snmpd/snmpmod.3 Directory Properties: stable/7/contrib/bsnmp/ (props changed) Changes in other areas also in this revision: Modified: stable/8/contrib/bsnmp/gensnmpdef/gensnmpdef.1 stable/8/contrib/bsnmp/gensnmptree/gensnmptree.1 stable/8/contrib/bsnmp/lib/asn1.3 stable/8/contrib/bsnmp/lib/bsnmpagent.3 stable/8/contrib/bsnmp/lib/bsnmpclient.3 stable/8/contrib/bsnmp/lib/bsnmplib.3 stable/8/contrib/bsnmp/snmp_mibII/snmp_mibII.3 stable/8/contrib/bsnmp/snmpd/bsnmpd.1 stable/8/contrib/bsnmp/snmpd/snmpmod.3 Directory Properties: stable/8/contrib/bsnmp/ (props changed) Modified: stable/7/contrib/bsnmp/gensnmpdef/gensnmpdef.1 == --- stable/7/contrib/bsnmp/gensnmpdef/gensnmpdef.1 Mon Aug 23 10:04:26 2010(r211701) +++ stable/7/contrib/bsnmp/gensnmpdef/gensnmpdef.1 Mon Aug 23 11:58:45 2010(r211702) @@ -3,7 +3,7 @@ .\"Hartmut Brandt. .\"All rights reserved. .\" -.\" Author: Harti Brandt +.\" Author: Harti Brandt .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -78,7 +78,7 @@ file by hand. .Sh SEE ALSO .Xr snmpd 1 .Sh AUTHORS -.An Hartmut Brandt Aq ha...@freebsd.org +.An Hartmut Brandt Aq ha...@freebsd.org .Sh BUGS The utility is by no means bullet-proof and may fail for complex or non-standard MIBs. Modified: stable/7/contrib/bsnmp/gensnmptree/gensnmptree.1 == --- stable/7/contrib/bsnmp/gensnmptree/gensnmptree.1Mon Aug 23 10:04:26 2010(r211701) +++ stable/7/contrib/bsnmp/gensnmptree/gensnmptree.1Mon Aug 23 11:58:45 2010(r211702) @@ -6,7 +6,7 @@ .\"Hartmut Brandt .\"All rights reserved. .\" -.\" Author: Harti Brandt +.\" Author: Harti Brandt .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -58,7 +58,7 @@ If none of the options .Fl e , .Fl E or -.FL t +.Fl t are used .Nm reads a MIB description from its standard input and creates two files: a @@ -243,4 +243,4 @@ typedef AdminStatus ENUM ( .Sh SEE ALSO .Xr bsnmpd 1 .Sh AUTHORS -.An Hartmut Brandt Aq ha...@freebsd.org +.An Hartmut Brandt Aq ha...@freebsd.org Modified: stable/7/contrib/bsnmp/lib/asn1.3 == --- stable/7/contrib/bsnmp/lib/asn1.3 Mon Aug 23 10:04:26 2010 (r211701) +++ stable/7/contrib/bsnmp/lib/asn1.3 Mon Aug 23 11:58:45 2010 (r211702) @@ -6,7 +6,7 @@ .\"Fraunhofer Institute for Open Communication Systems (FhG Fokus). .\"All rights reserved. .\" -.\" Author: Harti Brandt +.\" Author: Harti Brandt .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -489,4 +489,4 @@ followed by the error message and an opt This implementation conforms to the applicable IETF RFCs and ITU-T recommendations. .Sh AUTHORS -.An Hartmut Brandt Aq ha...@freebsd.org +.An Hartmut Brandt Aq ha...@freebsd.org Modified: stable/7/contrib/bsnmp/lib/bsnmpagent.3 == --- stable/7/contrib/bsnmp/lib/bsnmpagent.3 Mon Aug 23 10:04:26 2010 (r211701) +++ stable/7/contrib/bsnmp/lib/bsnmpagent.3 Mon Aug 23 11:58:45 2010 (r211702) @@ -6,7 +6,7 @@ .\"Fraunhofer Institute for Open Communication Systems (FhG Fokus). .\"All rights reserved. .\" -.\" Author: Harti Brandt +.\" Author: Harti Brandt .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -441,4 +441,4 @@ Additionally the functions may call snmp This implementation conforms to the applicable IETF RFCs and ITU-T recommendations. .Sh AUTHORS -.An Hartmut Brandt Aq ha...@freebsd.org +.An Hartmut Brandt Aq ha...@freebsd.org Modified: stable/7/contrib/bsnmp/lib/bsnmpclient.3 ==
Re: svn commit: r211533 - in stable/7/sys: cddl/contrib/opensolaris/uts/common/fs/zfs fs/cd9660 fs/udf kern sys ufs/ffs
On Friday, August 20, 2010 4:58:57 pm John Baldwin wrote: > Author: jhb > Date: Fri Aug 20 20:58:57 2010 > New Revision: 211533 > URL: http://svn.freebsd.org/changeset/base/211533 > > Log: > Revert 210173 as it did not properly fix the bug. It assumed that the > VI_LOCK() for a given vnode was used as the internal interlock for that > vnode's v_lock lockmgr lock. This is not the case. Instead, add dedicated > routines to toggle the LK_NOSHARE and LK_CANRECURSE flags. These routines > lock the lockmgr lock's internal interlock to synchronize the updates to > the flags member with other threads attempting to acquire the lock. The > VN_LOCK_A*() macros now invoke these routines, and the softupdates code > uses these routines to temporarly enable recursion on buffer locks. This is a direct commit rather than an MFC as the lockmgr implementation is completely different in relation to this bug than in 8.x and later. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r211501 - in head/sys: modules modules/send netinet netinet6 sys
In message: <20100823070057.ga6...@freebsd.org> Alexey Dokuchaev writes: : That said, I wish we all grow a thiker skin and start actually value the : criticism like we did in the old days. We do value criticism, when it is constructive, flexible and well timed. The point that everybody has been making is that Doug's criticism didn't meet these criteria. He chose a bad example (Ana already had a man page in review, evidently) and pressed it beyond all reason. The project has grown to this point because although we have guidelines, we intelligently apply them rather than having cast-in-stone rules (just look at our bylaws, for example). In addition, he presented no evidence to show that we have a problem that's worse than before. He didn't pick, say, those items added in the last year that still don't have documentation to bolster his case, nor did he research to see if there might be a small group of people that don't document and address his concerns to them rather than the whole group which my experience tells me is doing a good, but not perfect, job with documentation. In short, he flew off the handle at an issue he feels strongly about, and has been somewhat inflexible about accepting this very criticism. Warner ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211703 - in stable/8/sys: . amd64/include/xen cam cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci
Author: jhb Date: Mon Aug 23 13:47:20 2010 New Revision: 211703 URL: http://svn.freebsd.org/changeset/base/211703 Log: Move mergeinfo for sys/cam up to sys. Modified: Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cam/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211704 - in head/lib/libc: . stdlib
Author: kib
Date: Mon Aug 23 15:18:35 2010
New Revision: 211704
URL: http://svn.freebsd.org/changeset/base/211704
Log:
Style.
MFC after:3 days
Modified:
head/lib/libc/Makefile
head/lib/libc/stdlib/atexit.c
Modified: head/lib/libc/Makefile
==
--- head/lib/libc/Makefile Mon Aug 23 13:47:20 2010(r211703)
+++ head/lib/libc/Makefile Mon Aug 23 15:18:35 2010(r211704)
@@ -124,7 +124,7 @@ libkern.${MACHINE_ARCH}:: ${KMSRCS}
.if defined(KMSRCS) && !empty(KMSRCS)
cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE_ARCH}
.endif
-
+
.include
# Disable warnings in contributed sources.
Modified: head/lib/libc/stdlib/atexit.c
==
--- head/lib/libc/stdlib/atexit.c Mon Aug 23 13:47:20 2010
(r211703)
+++ head/lib/libc/stdlib/atexit.c Mon Aug 23 15:18:35 2010
(r211704)
@@ -120,7 +120,7 @@ atexit(void (*func)(void))
int error;
fn.fn_type = ATEXIT_FN_STD;
- fn.fn_ptr.std_func = func;;
+ fn.fn_ptr.std_func = func;
fn.fn_arg = NULL;
fn.fn_dso = NULL;
@@ -139,7 +139,7 @@ __cxa_atexit(void (*func)(void *), void
int error;
fn.fn_type = ATEXIT_FN_CXA;
- fn.fn_ptr.cxa_func = func;;
+ fn.fn_ptr.cxa_func = func;
fn.fn_arg = arg;
fn.fn_dso = dso;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211705 - in head: lib/libc/gen libexec/rtld-elf sys/sys
Author: kib
Date: Mon Aug 23 15:27:03 2010
New Revision: 211705
URL: http://svn.freebsd.org/changeset/base/211705
Log:
Introduce implementation-private rtld interface _rtld_addr_phdr, which
fills struct dl_phdr_info for the shared object that contains the
specified address, if any.
Idea and reviewed by: kan
MFC after:3 weeks
Modified:
head/lib/libc/gen/Symbol.map
head/lib/libc/gen/dlfcn.c
head/libexec/rtld-elf/Symbol.map
head/libexec/rtld-elf/rtld.c
head/sys/sys/link_elf.h
Modified: head/lib/libc/gen/Symbol.map
==
--- head/lib/libc/gen/Symbol.mapMon Aug 23 15:18:35 2010
(r211704)
+++ head/lib/libc/gen/Symbol.mapMon Aug 23 15:27:03 2010
(r211705)
@@ -446,6 +446,7 @@ FBSDprivate_1.0 {
_spinlock;
_spinlock_debug;
_spinunlock;
+ _rtld_addr_phdr;
_rtld_atfork_pre;
_rtld_atfork_post;
_rtld_error;/* for private use */
Modified: head/lib/libc/gen/dlfcn.c
==
--- head/lib/libc/gen/dlfcn.c Mon Aug 23 15:18:35 2010(r211704)
+++ head/lib/libc/gen/dlfcn.c Mon Aug 23 15:27:03 2010(r211705)
@@ -157,3 +157,11 @@ void
_rtld_atfork_post(int *locks)
{
}
+
+#pragma weak _rtld_addr_phdr
+int
+_rtld_addr_phdr(const void *addr, struct dl_phdr_info *phdr_info)
+{
+
+ return (0);
+}
Modified: head/libexec/rtld-elf/Symbol.map
==
--- head/libexec/rtld-elf/Symbol.mapMon Aug 23 15:18:35 2010
(r211704)
+++ head/libexec/rtld-elf/Symbol.mapMon Aug 23 15:27:03 2010
(r211705)
@@ -27,4 +27,5 @@ FBSDprivate_1.0 {
_rtld_free_tls;
_rtld_atfork_pre;
_rtld_atfork_post;
+_rtld_addr_phdr;
};
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cMon Aug 23 15:18:35 2010
(r211704)
+++ head/libexec/rtld-elf/rtld.cMon Aug 23 15:27:03 2010
(r211705)
@@ -147,6 +147,8 @@ static int rtld_verify_object_versions(
static void object_add_name(Obj_Entry *, const char *);
static int object_match_name(const Obj_Entry *, const char *);
static void ld_utrace_log(int, void *, void *, size_t, int, const char *);
+static void rtld_fill_dl_phdr_info(const Obj_Entry *obj,
+struct dl_phdr_info *phdr_info);
void r_debug_state(struct r_debug *, struct link_map *);
@@ -220,6 +222,7 @@ static func_ptr_type exports[] = {
(func_ptr_type) &dl_iterate_phdr,
(func_ptr_type) &_rtld_atfork_pre,
(func_ptr_type) &_rtld_atfork_post,
+(func_ptr_type) &_rtld_addr_phdr,
NULL
};
@@ -2261,6 +2264,24 @@ dlvsym(void *handle, const char *name, c
}
int
+_rtld_addr_phdr(const void *addr, struct dl_phdr_info *phdr_info)
+{
+const Obj_Entry *obj;
+int lockstate;
+
+lockstate = rlock_acquire(rtld_bind_lock);
+obj = obj_from_addr(addr);
+if (obj == NULL) {
+_rtld_error("No shared object contains address");
+ rlock_release(rtld_bind_lock, lockstate);
+return (0);
+}
+rtld_fill_dl_phdr_info(obj, phdr_info);
+rlock_release(rtld_bind_lock, lockstate);
+return (1);
+}
+
+int
dladdr(const void *addr, Dl_info *info)
{
const Obj_Entry *obj;
@@ -2362,6 +2383,21 @@ dlinfo(void *handle, int request, void *
return (error);
}
+static void
+rtld_fill_dl_phdr_info(const Obj_Entry *obj, struct dl_phdr_info *phdr_info)
+{
+
+ phdr_info->dlpi_addr = (Elf_Addr)obj->relocbase;
+ phdr_info->dlpi_name = STAILQ_FIRST(&obj->names) ?
+ STAILQ_FIRST(&obj->names)->name : obj->path;
+ phdr_info->dlpi_phdr = obj->phdr;
+ phdr_info->dlpi_phnum = obj->phsize / sizeof(obj->phdr[0]);
+ phdr_info->dlpi_tls_modid = obj->tlsindex;
+ phdr_info->dlpi_tls_data = obj->tlsinit;
+ phdr_info->dlpi_adds = obj_loads;
+ phdr_info->dlpi_subs = obj_loads - obj_count;
+}
+
int
dl_iterate_phdr(__dl_iterate_hdr_callback callback, void *param)
{
@@ -2375,16 +2411,7 @@ dl_iterate_phdr(__dl_iterate_hdr_callbac
error = 0;
for (obj = obj_list; obj != NULL; obj = obj->next) {
- phdr_info.dlpi_addr = (Elf_Addr)obj->relocbase;
- phdr_info.dlpi_name = STAILQ_FIRST(&obj->names) ?
- STAILQ_FIRST(&obj->names)->name : obj->path;
- phdr_info.dlpi_phdr = obj->phdr;
- phdr_info.dlpi_phnum = obj->phsize / sizeof(obj->phdr[0]);
- phdr_info.dlpi_tls_modid = obj->tlsindex;
- phdr_info.dlpi_tls_data = obj->tlsinit;
- phdr_info.dlpi_adds = obj_loads;
- phdr_info.dlpi_subs = obj_loads - obj_count;
-
+ rtld_fill_dl_phdr_info(obj, &phdr_info);
if ((error = callback(&phdr_info, sizeof phdr_info, param)) != 0)
break;
Modified: head/sys/sys/link_el
svn commit: r211706 - in head: lib/libc/gen lib/libc/include lib/libc/stdlib lib/libthr lib/libthr/thread libexec/rtld-elf
Author: kib
Date: Mon Aug 23 15:38:02 2010
New Revision: 211706
URL: http://svn.freebsd.org/changeset/base/211706
Log:
On shared object unload, in __cxa_finalize, call and clear all installed
atexit and __cxa_atexit handlers that are either installed by unloaded
dso, or points to the functions provided by the dso.
Use _rtld_addr_phdr to locate segment information from the address of
private variable belonging to the dso, supplied by crtstuff.c. Provide
utility function __elf_phdr_match_addr to do the match of address against
dso executable segment.
Call back into libthr from __cxa_finalize using weak
__pthread_cxa_finalize symbol to remove any atfork handler which
function points into unloaded object.
The rtld needs private __pthread_cxa_finalize symbol to not require
resolution of the weak undefined symbol at initialization time. This
cannot work, since rtld is relocated before sym_zero is set up.
Idea by: kan
Reviewed by: kan (previous version)
MFC after:3 weeks
Added:
head/lib/libc/gen/elf_utils.c (contents, props changed)
Modified:
head/lib/libc/gen/Makefile.inc
head/lib/libc/gen/Symbol.map
head/lib/libc/include/libc_private.h
head/lib/libc/stdlib/atexit.c
head/lib/libthr/pthread.map
head/lib/libthr/thread/thr_fork.c
head/lib/libthr/thread/thr_private.h
head/libexec/rtld-elf/rtld.c
Modified: head/lib/libc/gen/Makefile.inc
==
--- head/lib/libc/gen/Makefile.inc Mon Aug 23 15:27:03 2010
(r211705)
+++ head/lib/libc/gen/Makefile.inc Mon Aug 23 15:38:02 2010
(r211706)
@@ -10,7 +10,7 @@ SRCS+= __getosreldate.c __xuname.c \
alarm.c arc4random.c assert.c aux.c basename.c check_utility_compat.c \
clock.c closedir.c confstr.c \
crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \
- dlfcn.c drand48.c erand48.c err.c errlst.c errno.c \
+ dlfcn.c drand48.c elf_utils.c erand48.c err.c errlst.c errno.c \
exec.c fdevname.c feature_present.c fmtcheck.c fmtmsg.c fnmatch.c \
fpclassify.c frexp.c fstab.c ftok.c fts.c fts-compat.c ftw.c \
getbootfile.c getbsize.c \
Modified: head/lib/libc/gen/Symbol.map
==
--- head/lib/libc/gen/Symbol.mapMon Aug 23 15:27:03 2010
(r211705)
+++ head/lib/libc/gen/Symbol.mapMon Aug 23 15:38:02 2010
(r211706)
@@ -451,6 +451,7 @@ FBSDprivate_1.0 {
_rtld_atfork_post;
_rtld_error;/* for private use */
_rtld_thread_init; /* for private use */
+ __elf_phdr_match_addr;
_err;
_warn;
__fmtcheck;
Added: head/lib/libc/gen/elf_utils.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc/gen/elf_utils.c Mon Aug 23 15:38:02 2010
(r211706)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010 Konstantin Belousov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Neither the name of the author nor the names of any co-contributors
+ *may be used to endorse or promote products derived from this software
+ *without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (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$
+ */
+
+#include
+
+int
+__elf_phdr_match_addr(struct dl_phdr_info *phdr_info, void *addr)
+{
+ const Elf_Phdr *ph;
+ int i;
+
+ for (i = 0; i < phdr_info->dlpi_phnum; i++) {
+ ph = &phdr_info->dlpi_phdr[i];
+ if (ph->p_type != PT_LOAD || (ph->p_flags & PF_X) == 0)
+ continue;
+ if (phdr_info->dlpi_addr + ph->p_vaddr <= (uintptr_t)addr &&
+ (uintptr_t)addr + sizeof(addr) < phdr_info->dlpi_addr +
+ ph->p_vaddr + ph->p_memsz)
+
Re: svn commit: r211695 - head/sys/kern
Hi Pluknet...
I think that kern/Makefile is an ex-parrot and plan on removing it
later today.
Warner
P.S. sorry for the top post, but I wanted things in the archives..
In message:
pluknet writes:
: On 23 August 2010 10:22, Warner Losh wrote:
: > Author: imp
: > Date: Mon Aug 23 06:22:35 2010
: > New Revision: 211695
: > URL: http://svn.freebsd.org/changeset/base/211695
: >
: > Log:
: > This should really be MACHINE not MACHINE_ARCH, and is this Makefile even
used?
: >
:
: Hi.
:
: I wrote this letter almost 2.5y ago with no response.
: Hope this helps.
:
: %%%
: I looked at sys/kern/ Makefile Make.tags.inc. AFAICS they were partially
: abandoned years ago and has broken tags support and even contain 4.4BSD-Lite
: paths, that never ever being in FreeBSD CVS or was dropped years ago. So make
: links exits with error. It looks very odd:
:
: pl$ make links
: rm -f /var/db/sys_tags
: ln -s /sys/i386/tags /var/db/sys_tags
: for i in conf dev dev/scsi fs fs/deadfs fs/fdescfs fs/fifofs
: fs/lofs fs/nullfs fs/portalfs fs/procfs fs/specfs fs/unionfs hp
: hp/dev hp/hpux kern libkern net netinet nfs scripts sys ufs ufs/ffs
: ufs/lfs ufs/ufs vm; do (cd ../$i && { rm -f tags; ln -s
: /var/db/sys_tags tags; }) done
: cd: can't cd to ../dev/scsi
: cd: can't cd to ../fs/lofs
: cd: can't cd to ../fs/specfs
: cd: can't cd to ../hp
: cd: can't cd to ../hp/dev
: cd: can't cd to ../hp/hpux
: cd: can't cd to ../scripts
: cd: can't cd to ../ufs/lfs
: for i in i386; do (cd ../$i && make SYSTAGS=/var/db/sys_tags links); done
: for i in /sys/conf /sys/kern /sys/net /sys/netatalk /sys/netatm
: /sys/netinet /sys/netinet6 /sys/netipsec /sys/netipx /sys/netnatm
: /sys/nfs /sys/pci /sys/vm /sys/sys; do (cd $i && { rm -f tags; ln
: -s ../i386/tags tags; }) done
: for i in /sys/dev/advansys /sys/dev/aha /sys/dev/aic7xxx
: /sys/dev/buslogic /sys/dev/ccd /sys/dev/dec /sys/dev/dpt
: /sys/dev/en /sys/dev/hea /sys/dev/hfa /sys/dev/iicbus /sys/dev/isp
: /sys/dev/pdq /sys/dev/ppbus /sys/dev/smbus /sys/dev/vn
: /sys/dev/vx /sys/fs/deadfs /sys/fs/devfs /sys/fs/fdescfs
: /sys/fs/fifofs /sys/fs/msdosfs /sys/fs/nullfs /sys/fs/portalfs
: /sys/fs/procfs /sys
: /fs/specfs /sys/fs/unionfs /sys/fs/cd9660 /sys/ufs/ffs
: /sys/ufs/ufs; do (cd $i && { rm -f tags; ln -s ../../i386/tags tags;
: }) done
: cd: can't cd to /sys/dev/ccd
: cd: can't cd to /sys/dev/dec
: cd: can't cd to /sys/dev/hea
: cd: can't cd to /sys/dev/vn
: cd: can't cd to /sys/fs/specfs
: for i in apm i386 ibcs2 include isa linux; do (cd $i && { rm -f tags;
: ln -s ../tags tags; }) done
: cd: can't cd to apm
:
: I moved that two files from src and could complete build kernel
: without errors, so it
: seems they are not referenced by any kernel building tools.
:
: Yes, there is tags target in src/Makefile, I didn't looked too much
: how it interacts with Makefile Make.tags.inc, but by their erroneous
: paths I doubt there is any interaction.
:
: I found this in NetBSD's kern/Makefile:
: +# XXX
: +# [Note by Perry Metzger, Sept. 1998]
: +# As it stands, the tags support below is hopelessly
: +# broken. Just look at the names of the architectures it is dealing
: +# with and where it expects to find the support for them to see why.
: +# I've left the stuff in this Makefile alone in the hope that someone
: +# will fix it someday -- I am assuming that it might help that
: +# person if they have the old Makefile goo left in place as a starting
: +# point.
: +# XXX
:
: ps. BTW I tried to make tags from src/ (with clean obj, if that
: matters) and the target
: began to build my gcc (cc/cc_tools) after going through various world paths.
: Is that intended?
: %%%
:
: --
: wbr,
: pluknet
:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211707 - head/cddl/lib/libzpool
Author: nwhitehorn
Date: Mon Aug 23 16:47:29 2010
New Revision: 211707
URL: http://svn.freebsd.org/changeset/base/211707
Log:
Add powerpc64 to the list of architectures with real atomic operations.
Submitted by: imp
Modified:
head/cddl/lib/libzpool/Makefile
Modified: head/cddl/lib/libzpool/Makefile
==
--- head/cddl/lib/libzpool/Makefile Mon Aug 23 15:38:02 2010
(r211706)
+++ head/cddl/lib/libzpool/Makefile Mon Aug 23 16:47:29 2010
(r211707)
@@ -11,7 +11,7 @@
# LIST_SRCS
.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os
# ATOMIC_SRCS
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH}
== "ia64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH}
== "ia64" || ${MACHINE_ARCH} == "powerpc64"
.PATH:
${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
ATOMIC_SRCS= opensolaris_atomic.S
.else
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211713 - stable/7/sys/netgraph/bluetooth/l2cap
Author: emax
Date: Mon Aug 23 17:48:50 2010
New Revision: 211713
URL: http://svn.freebsd.org/changeset/base/211713
Log:
MFC r210783 as requested by Helge Oldach on freebsd-bluetooth@
Fix typo
PR: kern/140590
Modified:
stable/7/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
==
--- stable/7/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h Mon Aug 23
17:27:29 2010(r211712)
+++ stable/7/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h Mon Aug 23
17:48:50 2010(r211713)
@@ -379,7 +379,7 @@ do {
\
break; \
\
c = mtod((_m), struct _info_rsp *); \
- c->hdr.code = NG_L2CAP_INFO_REQ;\
+ c->hdr.code = NG_L2CAP_INFO_RSP;\
c->hdr.ident = (_ident);\
c->hdr.length = sizeof(c->param); \
\
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r211648 - head/sys/pci
On Mon, Aug 23, 2010 at 12:27:33AM -0600, Scott Long wrote: > On Aug 22, 2010, at 3:26 PM, Pyun YongHyeon wrote: > > Author: yongari > > Date: Sun Aug 22 21:26:35 2010 > > New Revision: 211648 > > URL: http://svn.freebsd.org/changeset/base/211648 > > > > Log: > > It seems some newer RTL8139 controllers provides only memory space > > register mapping. > > Something that I'm seeing more of in recent years is vendors putting > descriptive information into PCI VPD attributes, and having their Windows and > Linux drivers read these attributes and select behavior off of them instead > of selecting based on PCI ID. I don't have any RLT8139 specs to confirm that > this would be the case here, but it might be something to consider looking > into. > I also don't have data sheet for RTL8139 and I never saw rl(4) controllers which have VPD capability. But I think that's good idea to check. I've sent request mail to the user. Thanks for hints. :-) > Scott > ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211716 - head/sys/dev/xl
Author: yongari
Date: Mon Aug 23 18:51:31 2010
New Revision: 211716
URL: http://svn.freebsd.org/changeset/base/211716
Log:
Move xl_reset() to xl_init_locked(). This will make driver
initialize controller from a known good state. Previously driver
used to issue controller reset while TX/RX DMA are in progress.
I guess resetting controller in active TX/RX DMA cycle is to ensure
stopping I/Os in xl_shutdown(). I remember some buggy controllers
didn't respond with stop command if controller is under high
network load at the time of shutdown so resetting controller was
the only safe way to stop the I/Os. However, from my experiments,
controller always responded with stop command under high network
load so I think it's okay to remove the xl_reset() in
device_shutdown handler.
Resetting controller also will clear configured RX filter which
in turn will make WOL support hard because driver have to reprogram
RX filter in WOL handler as well as setting station address.
Modified:
head/sys/dev/xl/if_xl.c
Modified: head/sys/dev/xl/if_xl.c
==
--- head/sys/dev/xl/if_xl.c Mon Aug 23 18:21:40 2010(r211715)
+++ head/sys/dev/xl/if_xl.c Mon Aug 23 18:51:31 2010(r211716)
@@ -1635,7 +1635,6 @@ xl_detach(device_t dev)
/* These should only be active if attach succeeded */
if (device_is_attached(dev)) {
XL_LOCK(sc);
- xl_reset(sc);
xl_stop(sc);
XL_UNLOCK(sc);
taskqueue_drain(taskqueue_swi, &sc->xl_task);
@@ -2246,7 +2245,6 @@ xl_intr(void *arg)
}
if (status & XL_STAT_ADFAIL) {
- xl_reset(sc);
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
xl_init_locked(sc);
}
@@ -2318,7 +2316,6 @@ xl_poll_locked(struct ifnet *ifp, enum p
}
if (status & XL_STAT_ADFAIL) {
- xl_reset(sc);
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
xl_init_locked(sc);
}
@@ -2754,6 +2751,9 @@ xl_init_locked(struct xl_softc *sc)
*/
xl_stop(sc);
+ /* Reset the chip to a known state. */
+ xl_reset(sc);
+
if (sc->xl_miibus == NULL) {
CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_RESET);
xl_wait(sc);
@@ -3236,7 +3236,6 @@ xl_watchdog(struct xl_softc *sc)
device_printf(sc->xl_dev,
"no carrier - transceiver cable problem?\n");
- xl_reset(sc);
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
xl_init_locked(sc);
@@ -3335,7 +3334,6 @@ xl_shutdown(device_t dev)
sc = device_get_softc(dev);
XL_LOCK(sc);
- xl_reset(sc);
xl_stop(sc);
XL_UNLOCK(sc);
@@ -3367,7 +3365,6 @@ xl_resume(device_t dev)
XL_LOCK(sc);
- xl_reset(sc);
if (ifp->if_flags & IFF_UP) {
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
xl_init_locked(sc);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211717 - head/sys/dev/xl
Author: yongari
Date: Mon Aug 23 19:18:50 2010
New Revision: 211717
URL: http://svn.freebsd.org/changeset/base/211717
Log:
Implement basic WOL support. Note, not all xl(4) controllers
support WOL. Some controllers require additional 3-wire auxiliary
remote wakeup connector to draw power. More recent xl(4)
controllers may not need the wakeup connector though.
Modified:
head/sys/dev/xl/if_xl.c
head/sys/dev/xl/if_xlreg.h
Modified: head/sys/dev/xl/if_xl.c
==
--- head/sys/dev/xl/if_xl.c Mon Aug 23 18:51:31 2010(r211716)
+++ head/sys/dev/xl/if_xl.c Mon Aug 23 19:18:50 2010(r211717)
@@ -246,6 +246,7 @@ static int xl_watchdog(struct xl_softc *
static int xl_shutdown(device_t);
static int xl_suspend(device_t);
static int xl_resume(device_t);
+static void xl_setwol(struct xl_softc *);
#ifdef DEVICE_POLLING
static int xl_poll(struct ifnet *ifp, enum poll_cmd cmd, int count);
@@ -1145,10 +1146,10 @@ static int
xl_attach(device_t dev)
{
u_char eaddr[ETHER_ADDR_LEN];
- u_int16_t xcvr[2];
+ u_int16_t sinfo2, xcvr[2];
struct xl_softc *sc;
struct ifnet*ifp;
- int media;
+ int media, pmcap;
int unit, error = 0, rid, res;
uint16_tdid;
@@ -1405,6 +1406,18 @@ xl_attach(device_t dev)
else
sc->xl_type = XL_TYPE_90X;
+ /* Check availability of WOL. */
+ if ((sc->xl_caps & XL_CAPS_PWRMGMT) != 0 &&
+ pci_find_extcap(dev, PCIY_PMG, &pmcap) == 0) {
+ sc->xl_pmcap = pmcap;
+ sc->xl_flags |= XL_FLAG_WOL;
+ sinfo2 = 0;
+ xl_read_eeprom(sc, (caddr_t)&sinfo2, XL_EE_SOFTINFO2, 1, 0);
+ if ((sinfo2 & XL_SINFO2_AUX_WOL_CON) == 0 && bootverbose)
+ device_printf(dev,
+ "No auxiliary remote wakeup connector!\n");
+ }
+
/* Set the TX start threshold for best performance. */
sc->xl_tx_thresh = XL_MIN_FRAMELEN;
@@ -1419,6 +1432,8 @@ xl_attach(device_t dev)
ifp->if_capabilities |= IFCAP_HWCSUM;
#endif
}
+ if ((sc->xl_flags & XL_FLAG_WOL) != 0)
+ ifp->if_capabilities |= IFCAP_WOL_MAGIC;
ifp->if_capenable = ifp->if_capabilities;
#ifdef DEVICE_POLLING
ifp->if_capabilities |= IFCAP_POLLING;
@@ -2765,6 +2780,15 @@ xl_init_locked(struct xl_softc *sc)
if (sc->xl_miibus != NULL)
mii = device_get_softc(sc->xl_miibus);
+ /*
+* Clear WOL status and disable all WOL feature as WOL
+* would interfere Rx operation under normal environments.
+*/
+ if ((sc->xl_flags & XL_FLAG_WOL) != 0) {
+ XL_SEL_WIN(7);
+ CSR_READ_2(sc, XL_W7_BM_PME);
+ CSR_WRITE_2(sc, XL_W7_BM_PME, 0);
+ }
/* Init our MAC address */
XL_SEL_WIN(2);
for (i = 0; i < ETHER_ADDR_LEN; i++) {
@@ -3187,6 +3211,9 @@ xl_ioctl(struct ifnet *ifp, u_long comma
if ((mask & IFCAP_RXCSUM) != 0 &&
(ifp->if_capabilities & IFCAP_RXCSUM) != 0)
ifp->if_capenable ^= IFCAP_RXCSUM;
+ if ((mask & IFCAP_WOL_MAGIC) != 0 &&
+ (ifp->if_capabilities & IFCAP_WOL_MAGIC) != 0)
+ ifp->if_capenable ^= IFCAP_WOL_MAGIC;
XL_UNLOCK(sc);
break;
default:
@@ -3329,15 +3356,8 @@ xl_stop(struct xl_softc *sc)
static int
xl_shutdown(device_t dev)
{
- struct xl_softc *sc;
-
- sc = device_get_softc(dev);
-
- XL_LOCK(sc);
- xl_stop(sc);
- XL_UNLOCK(sc);
- return (0);
+ return (xl_suspend(dev));
}
static int
@@ -3349,6 +3369,7 @@ xl_suspend(device_t dev)
XL_LOCK(sc);
xl_stop(sc);
+ xl_setwol(sc);
XL_UNLOCK(sc);
return (0);
@@ -3374,3 +3395,34 @@ xl_resume(device_t dev)
return (0);
}
+
+static void
+xl_setwol(struct xl_softc *sc)
+{
+ struct ifnet*ifp;
+ u_int16_t cfg, pmstat;
+
+ if ((sc->xl_flags & XL_FLAG_WOL) == 0)
+ return;
+
+ ifp = sc->xl_ifp;
+ XL_SEL_WIN(7);
+ /* Clear any pending PME events. */
+ CSR_READ_2(sc, XL_W7_BM_PME);
+ cfg = 0;
+ if ((ifp->if_capenable & IFCAP_WOL_MAGIC) != 0)
+ cfg |= XL_BM_PME_MAGIC;
+ CSR_WRITE_2(sc, XL_W7_BM_PME, cfg);
+ /* Enable RX. */
+ if ((ifp->if_capenable & IFCAP_WOL_MAGIC) != 0)
+ CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_ENABLE);
+ /* Request PME. */
+ pmstat = pci_read_config(sc->xl_dev,
+ sc->xl_pmcap + PCIR_POWER_STATUS, 2);
+ if ((ifp->if_capenable & IFCAP_WOL_MAGIC) !
svn commit: r211719 - in stable/8: contrib/bsnmp/snmp_mibII sbin/ifconfig usr.sbin/ndp usr.sbin/ppp
Author: jhb
Date: Mon Aug 23 20:53:01 2010
New Revision: 211719
URL: http://svn.freebsd.org/changeset/base/211719
Log:
MFC 210936,210946:
Ethernet vlan(4) interfaces have valid Ethernet link layer addresses but
use a different interface type (IFT_L2VLAN vs IFT_ETHER). Treat IFT_L2VLAN
interfaces like IFT_ETHER interfaces when handling link layer addresses.
Modified:
stable/8/contrib/bsnmp/snmp_mibII/mibII.c
stable/8/sbin/ifconfig/af_link.c
stable/8/usr.sbin/ndp/ndp.c
stable/8/usr.sbin/ppp/ipv6cp.c
Directory Properties:
stable/8/contrib/bsnmp/ (props changed)
stable/8/sbin/ifconfig/ (props changed)
stable/8/usr.sbin/ndp/ (props changed)
stable/8/usr.sbin/ppp/ (props changed)
Modified: stable/8/contrib/bsnmp/snmp_mibII/mibII.c
==
--- stable/8/contrib/bsnmp/snmp_mibII/mibII.c Mon Aug 23 20:19:17 2010
(r211718)
+++ stable/8/contrib/bsnmp/snmp_mibII/mibII.c Mon Aug 23 20:53:01 2010
(r211719)
@@ -843,6 +843,7 @@ check_llbcast(struct mibif *ifp)
case IFT_ETHER:
case IFT_FDDI:
case IFT_ISO88025:
+ case IFT_L2VLAN:
if (mib_find_rcvaddr(ifp->index, ether_bcast, 6) == NULL &&
(rcv = mib_rcvaddr_create(ifp, ether_bcast, 6)) != NULL)
rcv->flags |= MIBRCVADDR_BCAST;
Modified: stable/8/sbin/ifconfig/af_link.c
==
--- stable/8/sbin/ifconfig/af_link.cMon Aug 23 20:19:17 2010
(r211718)
+++ stable/8/sbin/ifconfig/af_link.cMon Aug 23 20:53:01 2010
(r211719)
@@ -58,7 +58,9 @@ link_status(int s __unused, const struct
struct sockaddr_dl *sdl = (struct sockaddr_dl *) ifa->ifa_addr;
if (sdl != NULL && sdl->sdl_alen > 0) {
- if (sdl->sdl_type == IFT_ETHER &&
+ if ((sdl->sdl_type == IFT_ETHER ||
+ sdl->sdl_type == IFT_L2VLAN ||
+ sdl->sdl_type == IFT_BRIDGE) &&
sdl->sdl_alen == ETHER_ADDR_LEN)
printf("\tether %s\n",
ether_ntoa((struct ether_addr *)LLADDR(sdl)));
Modified: stable/8/usr.sbin/ndp/ndp.c
==
--- stable/8/usr.sbin/ndp/ndp.c Mon Aug 23 20:19:17 2010(r211718)
+++ stable/8/usr.sbin/ndp/ndp.c Mon Aug 23 20:53:01 2010(r211719)
@@ -437,6 +437,7 @@ set(argc, argv)
switch (sdl->sdl_type) {
case IFT_ETHER: case IFT_FDDI: case IFT_ISO88023:
case IFT_ISO88024: case IFT_ISO88025:
+ case IFT_L2VLAN: case IFT_BRIDGE:
goto overwrite;
}
}
Modified: stable/8/usr.sbin/ppp/ipv6cp.c
==
--- stable/8/usr.sbin/ppp/ipv6cp.c Mon Aug 23 20:19:17 2010
(r211718)
+++ stable/8/usr.sbin/ppp/ipv6cp.c Mon Aug 23 20:53:01 2010
(r211719)
@@ -148,6 +148,7 @@ SetInterfaceID(u_char *ifid, int userand
switch(sdl->sdl_type) {
case IFT_ETHER:
case IFT_FDDI:
+case IFT_L2VLAN:
/* XXX need more cases? */
break;
default:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211720 - in stable/7: contrib/bsnmp/snmp_mibII sbin/ifconfig usr.sbin/ndp usr.sbin/ppp
Author: jhb
Date: Mon Aug 23 20:53:24 2010
New Revision: 211720
URL: http://svn.freebsd.org/changeset/base/211720
Log:
MFC 210936,210946:
Ethernet vlan(4) interfaces have valid Ethernet link layer addresses but
use a different interface type (IFT_L2VLAN vs IFT_ETHER). Treat IFT_L2VLAN
interfaces like IFT_ETHER interfaces when handling link layer addresses.
Modified:
stable/7/contrib/bsnmp/snmp_mibII/mibII.c
stable/7/sbin/ifconfig/af_link.c
stable/7/usr.sbin/ndp/ndp.c
stable/7/usr.sbin/ppp/ipv6cp.c
Directory Properties:
stable/7/contrib/bsnmp/ (props changed)
stable/7/sbin/ifconfig/ (props changed)
stable/7/usr.sbin/ndp/ (props changed)
stable/7/usr.sbin/ppp/ (props changed)
Modified: stable/7/contrib/bsnmp/snmp_mibII/mibII.c
==
--- stable/7/contrib/bsnmp/snmp_mibII/mibII.c Mon Aug 23 20:53:01 2010
(r211719)
+++ stable/7/contrib/bsnmp/snmp_mibII/mibII.c Mon Aug 23 20:53:24 2010
(r211720)
@@ -821,6 +821,7 @@ check_llbcast(struct mibif *ifp)
case IFT_ETHER:
case IFT_FDDI:
case IFT_ISO88025:
+ case IFT_L2VLAN:
if (mib_find_rcvaddr(ifp->index, ether_bcast, 6) == NULL &&
(rcv = mib_rcvaddr_create(ifp, ether_bcast, 6)) != NULL)
rcv->flags |= MIBRCVADDR_BCAST;
Modified: stable/7/sbin/ifconfig/af_link.c
==
--- stable/7/sbin/ifconfig/af_link.cMon Aug 23 20:53:01 2010
(r211719)
+++ stable/7/sbin/ifconfig/af_link.cMon Aug 23 20:53:24 2010
(r211720)
@@ -58,7 +58,9 @@ link_status(int s __unused, const struct
struct sockaddr_dl *sdl = (struct sockaddr_dl *) ifa->ifa_addr;
if (sdl != NULL && sdl->sdl_alen > 0) {
- if (sdl->sdl_type == IFT_ETHER &&
+ if ((sdl->sdl_type == IFT_ETHER ||
+ sdl->sdl_type == IFT_L2VLAN ||
+ sdl->sdl_type == IFT_BRIDGE) &&
sdl->sdl_alen == ETHER_ADDR_LEN)
printf("\tether %s\n",
ether_ntoa((struct ether_addr *)LLADDR(sdl)));
Modified: stable/7/usr.sbin/ndp/ndp.c
==
--- stable/7/usr.sbin/ndp/ndp.c Mon Aug 23 20:53:01 2010(r211719)
+++ stable/7/usr.sbin/ndp/ndp.c Mon Aug 23 20:53:24 2010(r211720)
@@ -433,6 +433,7 @@ set(argc, argv)
switch (sdl->sdl_type) {
case IFT_ETHER: case IFT_FDDI: case IFT_ISO88023:
case IFT_ISO88024: case IFT_ISO88025:
+ case IFT_L2VLAN: case IFT_BRIDGE:
goto overwrite;
}
}
Modified: stable/7/usr.sbin/ppp/ipv6cp.c
==
--- stable/7/usr.sbin/ppp/ipv6cp.c Mon Aug 23 20:53:01 2010
(r211719)
+++ stable/7/usr.sbin/ppp/ipv6cp.c Mon Aug 23 20:53:24 2010
(r211720)
@@ -148,6 +148,7 @@ SetInterfaceID(u_char *ifid, int userand
switch(sdl->sdl_type) {
case IFT_ETHER:
case IFT_FDDI:
+case IFT_L2VLAN:
/* XXX need more cases? */
break;
default:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211721 - head/sys/dev/ed
Author: yongari
Date: Mon Aug 23 21:40:03 2010
New Revision: 211721
URL: http://svn.freebsd.org/changeset/base/211721
Log:
Fix a possible unaligned access to savebyte array.
PR: kern/122195
Modified:
head/sys/dev/ed/if_ed.c
Modified: head/sys/dev/ed/if_ed.c
==
--- head/sys/dev/ed/if_ed.c Mon Aug 23 20:53:24 2010(r211720)
+++ head/sys/dev/ed/if_ed.c Mon Aug 23 21:40:03 2010(r211721)
@@ -1476,9 +1476,12 @@ ed_pio_write_mbufs(struct ed_softc *sc,
}
} else {
/* NE2000s are a pain */
- unsigned char *data;
+ uint8_t *data;
int len, wantbyte;
- unsigned char savebyte[2];
+ union {
+ uint16_t w;
+ uint8_t b[2];
+ } saveword;
wantbyte = 0;
@@ -1488,9 +1491,9 @@ ed_pio_write_mbufs(struct ed_softc *sc,
data = mtod(m, caddr_t);
/* finish the last word */
if (wantbyte) {
- savebyte[1] = *data;
+ saveword.b[1] = *data;
ed_asic_outw(sc, ED_NOVELL_DATA,
-*(u_short *)savebyte);
+ saveword.w);
data++;
len--;
wantbyte = 0;
@@ -1504,7 +1507,7 @@ ed_pio_write_mbufs(struct ed_softc *sc,
}
/* save last byte, if necessary */
if (len == 1) {
- savebyte[0] = *data;
+ saveword.b[0] = *data;
wantbyte = 1;
}
}
@@ -1512,7 +1515,7 @@ ed_pio_write_mbufs(struct ed_softc *sc,
}
/* spit last byte */
if (wantbyte)
- ed_asic_outw(sc, ED_NOVELL_DATA, *(u_short *)savebyte);
+ ed_asic_outw(sc, ED_NOVELL_DATA, saveword.w);
}
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r211609 - head/tools/regression/bin/sh/builtins
On Mon, Aug 23, 2010 at 12:33:14AM -0700, Brian Somers wrote:
> On Sun, 22 Aug 2010 11:04:30 + (UTC) Jilles Tjoelker
> wrote:
> > Author: jilles
> > Date: Sun Aug 22 11:04:30 2010
> > New Revision: 211609
> > URL: http://svn.freebsd.org/changeset/base/211609
> > Log:
> > sh: Add a test for breaking from a loop outside the current function.
> > It is unwise to rely on this but I'd like to know if this would break.
> > Added:
> > head/tools/regression/bin/sh/builtins/break3.0 (contents, props changed)
> > Added: head/tools/regression/bin/sh/builtins/break3.0
> > ==
> > --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> > +++ head/tools/regression/bin/sh/builtins/break3.0 Sun Aug 22 11:04:30
> > 2010(r211609)
> > @@ -0,0 +1,15 @@
> > +# $FreeBSD$
> > +
> > +# We accept this and people might rely on it.
> > +# However, various other shells do not accept it.
> > +
> > +f() {
> > + break
> > + echo bad1
> > +}
> > +
> > +while :; do
> > + f
> > + echo bad2
> > + exit 2
> > +done
> This feature should be counted as a bug IMHO. How can f() possibly
> know whether there's a surrounding context to break from?
If you replace f by its definition, there is an obvious meaning.
And how about a script like:
while :; do
f() { ...; break; ...; }
...
f
...
done
I will admit that there are various other shells that do not implement
this.
> Having said that, this behaviour is the same in bash except that bash
> will complain if it's asked to break when the context is wrong,
> perhaps we should complain too?
> $ bash -c 'f() { break; echo no break; }; for f in good bad; do echo $f; f;
> done'
> good
> $ sh -c 'f() { break; echo no break; }; for f in good bad; do echo $f; f;
> done'
> good
> $ bash -c 'f() { break; echo no break; }; f'
> bash: line 0: break: only meaningful in a `for', `while', or `until' loop
> no break
> $ bash -c 'f() { break 2>/dev/null; echo no break; }; f'
> no break
> $ sh -c 'f() { break; echo no break; }; f'
> no break
The System V sh and ksh93 behave the same way with break and continue
builtins outside loops.
I don't think this is very broken, and there is a limit on how many
incompatible changes I'm willing to make. This doesn't make the cut.
Warning messages to stderr mostly get lost in the noise, I don't really
like them. I do not expect people to test for failure of break and
continue, and bash even sets $? to 0 despite printing a warning. If this
error is so important as to need an error message I think should abort
the shell as well (via error(), so that "command break" will avoid
aborting).
Furthermore note that bash disables these warnings in POSIX mode.
As an aside, if breaking out of a function were to be disallowed, a
stronger approach seems possible: special builtins cannot be overridden
by functions or PATH (we currently do not implement this), so if the
parser (after alias expansion) sees a command "break" or "continue", it
must be the special builtin and a parse error could result if it is not
in a loop, or possibly a ksh93-like parse warning with -n.
--
Jilles Tjoelker
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211722 - head/cddl/lib/libzpool
Author: marius
Date: Mon Aug 23 22:04:30 2010
New Revision: 211722
URL: http://svn.freebsd.org/changeset/base/211722
Log:
Use real atomic operations for sparc64.
MFC after:1 week
Modified:
head/cddl/lib/libzpool/Makefile
Modified: head/cddl/lib/libzpool/Makefile
==
--- head/cddl/lib/libzpool/Makefile Mon Aug 23 21:40:03 2010
(r211721)
+++ head/cddl/lib/libzpool/Makefile Mon Aug 23 22:04:30 2010
(r211722)
@@ -11,7 +11,7 @@
# LIST_SRCS
.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os
# ATOMIC_SRCS
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH}
== "ia64" || ${MACHINE_ARCH} == "powerpc64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH}
== "ia64" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "powerpc64"
.PATH:
${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
ATOMIC_SRCS= opensolaris_atomic.S
.else
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211723 - in stable/8/usr.bin/calendar: . calendars calendars/ru_RU.KOI8-R
Author: edwin
Date: Mon Aug 23 22:09:25 2010
New Revision: 211723
URL: http://svn.freebsd.org/changeset/base/211723
Log:
MFC of r205821 r205827 r205828 r205862 r205872 r205937 r206568
MFC of r208825 r208826 r208827 r208828 r208829 r208943
r205821:
Long awaited update to the calendar system:
- Repeating events which span multiple years (because of -A, -B or
just the three days before the end of the year).
- Support for lunar events (full moon, new moon) and solar events
(equinox and solstice, chinese new year). Because of this, the
options -U (UTC offset) and -l (longitude) are available to
compensate if reality doesn't match the calculated values.
r205828:
Use local names for calendar.dutch
r205862:
Fix DST thingies in calendar.australia
r205872:
Make licenses 3 clause instead of 4 clause
r205937:
Make the dates in the Tasmanian part of calendar.australia properly
variable.
r206568:
Typo in Allerheiligen in calendar.dutch
r208825, r208826, r208827, r208828, r208829, r208943:
Coverity Prevent related fixes.
Modified:
stable/8/usr.bin/calendar/Makefile
stable/8/usr.bin/calendar/calendar.1
stable/8/usr.bin/calendar/calendar.c
stable/8/usr.bin/calendar/calendar.h
stable/8/usr.bin/calendar/calendars/calendar.australia
stable/8/usr.bin/calendar/calendars/calendar.dutch
stable/8/usr.bin/calendar/calendars/calendar.freebsd
stable/8/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common (contents,
props changed)
stable/8/usr.bin/calendar/day.c
stable/8/usr.bin/calendar/io.c
stable/8/usr.bin/calendar/ostern.c
stable/8/usr.bin/calendar/paskha.c
stable/8/usr.bin/calendar/pathnames.h
Directory Properties:
stable/8/usr.bin/calendar/ (props changed)
Modified: stable/8/usr.bin/calendar/Makefile
==
--- stable/8/usr.bin/calendar/Makefile Mon Aug 23 22:04:30 2010
(r211722)
+++ stable/8/usr.bin/calendar/Makefile Mon Aug 23 22:09:25 2010
(r211723)
@@ -2,13 +2,17 @@
# $FreeBSD$
PROG= calendar
-SRCS= calendar.c io.c day.c ostern.c paskha.c
+SRCS= calendar.c locale.c events.c dates.c parsedata.c io.c day.c \
+ ostern.c paskha.c pom.c sunpos.c
+LDADD= -lm
INTER= de_AT.ISO_8859-15 de_DE.ISO8859-1 fr_FR.ISO8859-1 \
hr_HR.ISO8859-2 hu_HU.ISO8859-2 ru_RU.KOI8-R uk_UA.KOI8-U
DE_LINKS= de_DE.ISO8859-15
FR_LINKS= fr_FR.ISO8859-15
TEXTMODE?= 444
+WARNS?=7
+
beforeinstall:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
Modified: stable/8/usr.bin/calendar/calendar.1
==
--- stable/8/usr.bin/calendar/calendar.1Mon Aug 23 22:04:30 2010
(r211722)
+++ stable/8/usr.bin/calendar/calendar.1Mon Aug 23 22:09:25 2010
(r211723)
@@ -9,10 +9,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\"notice, this list of conditions and the following disclaimer in the
.\"documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\"may be used to endorse or promote products derived from this software
.\"without specific prior written permission.
@@ -54,6 +50,8 @@
.Ek
.Oc
.Op Fl W Ar num
+.Op Fl U Ar UTC-offset
+.Op Fl l Ar longitude
.Sh DESCRIPTION
The
.Nm
@@ -93,6 +91,12 @@ as the default calendar file.
.Sm on
.Xc
For test purposes only: set date directly to argument values.
+.It Fl l Ar longitude , Fl U Ar UTC-offset
+Only one is needed:
+Perform lunar and solar calculations from this longitude or from
+this UTC offset.
+If neither is specified, the calculations will be based on the
+difference between UTC time and localtime.
.It Fl W Ar num
Print lines from today and the next
.Ar num
@@ -103,12 +107,36 @@ Ignore weekends when calculating the num
To handle calendars in your national code table you can specify
.Dq LANG=
in the calendar file as early as possible.
-To handle national Easter
-names in the calendars
-.Dq Easter=
-(for Catholic Easter) or
-.Dq Paskha=
-(for Orthodox Easter) can be used.
+.Pp
+To handle the local name of sequences, you can specify them as:
+.Dq SEQUENCE=
+in the calendar file as early as possible.
+.Pp
+The names of the following special days are recognized:
+.Bl -tag -width 123456789012345 -compact
+.It Easter
+Catholic Easter.
+.It Paskha
+Orthodox Easter.
+.It NewMoon
+The lunar New Moon.
+.It FullMoon
+The lunar Full Moon.
+.It MarEquinox
+The solar eq
svn commit: r211725 - in head: . cddl/lib/libdtrace cddl/lib/libzpool gnu/lib/csu gnu/lib/libgomp gnu/lib/libstdc++ gnu/usr.bin/binutils/gdb gnu/usr.bin/gdb gnu/usr.bin/gdb/gdbserver include lib li...
Author: imp
Date: Mon Aug 23 22:24:11 2010
New Revision: 211725
URL: http://svn.freebsd.org/changeset/base/211725
Log:
MFtbemd:
Prefer MACHNE_CPUARCH to MACHINE_ARCH in most contexts where you want
to test of all the CPUs of a given family conform.
Modified:
head/Makefile.inc1
head/cddl/lib/libdtrace/Makefile
head/cddl/lib/libzpool/Makefile
head/gnu/lib/csu/Makefile
head/gnu/lib/libgomp/Makefile
head/gnu/lib/libstdc++/Makefile
head/gnu/usr.bin/binutils/gdb/Makefile
head/gnu/usr.bin/gdb/Makefile
head/gnu/usr.bin/gdb/gdbserver/Makefile
head/include/Makefile
head/lib/Makefile
head/lib/libc/Makefile
head/lib/libc/compat-43/Makefile.inc
head/lib/libc/gen/Makefile.inc
head/lib/libc/locale/Makefile.inc
head/lib/libc/quad/Makefile.inc
head/lib/libc/softfloat/Makefile.inc
head/lib/libc/stdlib/Makefile.inc
head/lib/libc/string/Makefile.inc
head/lib/libc/sys/Makefile.inc
head/lib/libc_r/sys/Makefile.inc
head/lib/libdisk/Makefile
head/lib/libkvm/Makefile
head/lib/libpmc/Makefile
head/lib/libstand/Makefile
head/lib/libthread_db/Makefile
head/lib/msun/Makefile
head/libexec/rtld-elf/Makefile
head/libexec/rtld-elf/amd64/Makefile.inc
head/libexec/rtld-elf/i386/Makefile.inc
head/rescue/rescue/Makefile
head/sbin/atm/atmconfig/Makefile
head/sbin/bsdlabel/Makefile
head/sbin/camcontrol/Makefile
head/sbin/gbde/Makefile
head/sbin/newfs_msdos/Makefile
head/sbin/sunlabel/Makefile
head/secure/lib/libcrypto/Makefile
head/share/man/man4/Makefile
head/share/man/man5/Makefile
head/share/mk/bsd.lib.mk
head/share/mk/bsd.sys.mk
head/sys/boot/arm/ixp425/boot2/Makefile
head/sys/conf/kern.post.mk
head/sys/conf/kern.pre.mk
head/usr.bin/ldd/Makefile
head/usr.bin/truss/Makefile
head/usr.sbin/ac/Makefile
head/usr.sbin/amd/Makefile.inc
head/usr.sbin/apm/Makefile
head/usr.sbin/kldxref/Makefile
head/usr.sbin/sade/Makefile
head/usr.sbin/sysinstall/Makefile
head/usr.sbin/tcpdump/tcpdump/Makefile
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Mon Aug 23 22:21:37 2010(r211724)
+++ head/Makefile.inc1 Mon Aug 23 22:24:11 2010(r211725)
@@ -1131,8 +1131,8 @@ _prereq_libs= gnu/lib/libssp/libssp_nons
# all shared libraries for ELF.
#
_startup_libs= gnu/lib/csu
-.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
-_startup_libs+=lib/csu/${MACHINE_ARCH}-elf
+.if exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf)
+_startup_libs+=lib/csu/${MACHINE_CPUARCH}-elf
.elif exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf)
_startup_libs+=lib/csu/${MACHINE_CPUARCH}-elf
.elif exists(${.CURDIR}/lib/csu/${MACHINE_ARCH})
Modified: head/cddl/lib/libdtrace/Makefile
==
--- head/cddl/lib/libdtrace/MakefileMon Aug 23 22:21:37 2010
(r211724)
+++ head/cddl/lib/libdtrace/MakefileMon Aug 23 22:24:11 2010
(r211725)
@@ -63,11 +63,11 @@ CFLAGS+=-I${.OBJDIR} -I${.CURDIR} \
#CFLAGS+= -DYYDEBUG
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel -DDIS_MEM
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/i386
.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/${MACHINE_ARCH}
-.elif ${MACHINE_ARCH} == "sparc64"
+.elif ${MACHINE_CPUARCH} == "sparc64"
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/sparc
.else
Modified: head/cddl/lib/libzpool/Makefile
==
--- head/cddl/lib/libzpool/Makefile Mon Aug 23 22:21:37 2010
(r211724)
+++ head/cddl/lib/libzpool/Makefile Mon Aug 23 22:24:11 2010
(r211725)
@@ -51,7 +51,7 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/cont
CFLAGS+= -DWANTS_MUTEX_OWNED
CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread
CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys
-CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_ARCH}/include
+CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
DPADD= ${LIBPTHREAD} ${LIBZ}
LDADD= -lpthread -lz
Modified: head/gnu/lib/csu/Makefile
==
--- head/gnu/lib/csu/Makefile Mon Aug 23 22:21:37 2010(r211724)
+++ head/gnu/lib/csu/Makefile Mon Aug 23 22:24:11 2010(r211725)
@@ -24,18 +24,18 @@ CFLAGS+=-I${GCCLIB}/include -I${GCCDIR}
CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG}
MKDEP= -DCRT_BEGIN
-.if ${MACHINE_ARCH} == "ia64"
+.if ${MACHINE_CPUARCH} == "ia64"
BEGINSRC= crtbegin.asm
ENDSRC=crtend.asm
CFLAGS+= -x assembler-with-cpp
Re: svn commit: r211722 - head/cddl/lib/libzpool
In message: <201008232204.o7nm4upa054...@svn.freebsd.org>
Marius Strobl writes:
: Author: marius
: Date: Mon Aug 23 22:04:30 2010
: New Revision: 211722
: URL: http://svn.freebsd.org/changeset/base/211722
:
: Log:
: Use real atomic operations for sparc64.
:
: MFC after: 1 week
:
: Modified:
: head/cddl/lib/libzpool/Makefile
:
: Modified: head/cddl/lib/libzpool/Makefile
: ==
: --- head/cddl/lib/libzpool/Makefile Mon Aug 23 21:40:03 2010
(r211721)
: +++ head/cddl/lib/libzpool/Makefile Mon Aug 23 22:04:30 2010
(r211722)
: @@ -11,7 +11,7 @@
: # LIST_SRCS
: .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os
: # ATOMIC_SRCS
: -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" ||
${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "powerpc64"
: +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" ||
${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} ==
"powerpc64"
: .PATH:
${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
: ATOMIC_SRCS= opensolaris_atomic.S
: .else
I find it disturbing that we have 3 or 4 copies of this code in our
Makefiles...
Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r211648 - head/sys/pci
On Mon, Aug 23, 2010 at 11:25:16AM -0700, Pyun YongHyeon wrote: > On Mon, Aug 23, 2010 at 12:27:33AM -0600, Scott Long wrote: > > On Aug 22, 2010, at 3:26 PM, Pyun YongHyeon wrote: > > > Author: yongari > > > Date: Sun Aug 22 21:26:35 2010 > > > New Revision: 211648 > > > URL: http://svn.freebsd.org/changeset/base/211648 > > > > > > Log: > > > It seems some newer RTL8139 controllers provides only memory space > > > register mapping. > > > > Something that I'm seeing more of in recent years is vendors putting > > descriptive information into PCI VPD attributes, and having their Windows > > and Linux drivers read these attributes and select behavior off of them > > instead of selecting based on PCI ID. I don't have any RLT8139 specs to > > confirm that this would be the case here, but it might be something to > > consider looking into. > > > > I also don't have data sheet for RTL8139 and I never saw rl(4) > controllers which have VPD capability. But I think that's good idea > to check. I've sent request mail to the user. > Thanks for hints. :-) > It seems the controller has no PCI VPD capability so I guess the idea is not applicable to RTL8139 controllers. Anyway, thanks a lot! ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r211304 - head/lib/libutil
On Mon, 23 Aug 2010, [utf-8] Dag-Erling Sm??rgrav wrote: Dimitry Andric writes: Dag-Erling Sm??rgrav writes: Bruce Cran writes: Somewhat related, there are overflow bugs in humanize_number - for example df(1) fails to display space from a 100PB filesystem correctly. Patch? :) Attached. This makes humanize_number() work properly for all possible int64_t values. That's awesome! Any way I can convince you to fix expand_number() as well? I got a detailed explanation of what's wrong with it (both before and after my commits) from bde@ (cc:ed) in private correspondence; I can forward it to you if he doesn't mind. OK. I think the final point was that it should go back to supporting signed numbers (only), and that means int64_t ones until scientificize^dehumanize^W humanize_number() is fixed to support intmax_t ones. Bruce___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211729 - head/contrib/gcc
Author: rpaulo
Date: Tue Aug 24 00:23:40 2010
New Revision: 211729
URL: http://svn.freebsd.org/changeset/base/211729
Log:
Mark the following static variables as __used__ instead of __unused__:
o force_to_data
o __CTOR_LIST__
o __do_global_dtors_aux_fini_array_entry
o __frame_dummy_init_array_entry
This is necessary because Clang is smart enough to optimize out these
variables was they were marked as __unused__ (and they are also static).
The end result was programs segfaulting because these symbols weren't
present.
This follows the upstream revision 159228 and the author of that
revision (Jan Hubicka ) allowed us to backport this to our
GPLv2 GCC.
Discussed with: core
Modified:
head/contrib/gcc/crtstuff.c
Modified: head/contrib/gcc/crtstuff.c
==
--- head/contrib/gcc/crtstuff.c Tue Aug 24 00:17:05 2010(r211728)
+++ head/contrib/gcc/crtstuff.c Tue Aug 24 00:23:40 2010(r211729)
@@ -175,14 +175,14 @@ CTOR_LIST_BEGIN;
#elif defined(CTORS_SECTION_ASM_OP)
/* Hack: force cc1 to switch to .data section early, so that assembling
__CTOR_LIST__ does not undo our behind-the-back change to .ctors. */
-static func_ptr force_to_data[1] __attribute__ ((__unused__)) = { };
+static func_ptr force_to_data[1] __attribute__ ((__used__)) = { };
asm (CTORS_SECTION_ASM_OP);
STATIC func_ptr __CTOR_LIST__[1]
- __attribute__ ((__unused__, aligned(sizeof(func_ptr
+ __attribute__ ((__used__, aligned(sizeof(func_ptr
= { (func_ptr) (-1) };
#else
STATIC func_ptr __CTOR_LIST__[1]
- __attribute__ ((__unused__, section(".ctors"), aligned(sizeof(func_ptr
+ __attribute__ ((__used__, section(".ctors"), aligned(sizeof(func_ptr
= { (func_ptr) (-1) };
#endif /* __CTOR_LIST__ alternatives */
@@ -308,7 +308,7 @@ __do_global_dtors_aux (void)
CRT_CALL_STATIC_FUNCTION (FINI_SECTION_ASM_OP, __do_global_dtors_aux)
#else /* !defined(FINI_SECTION_ASM_OP) */
static func_ptr __do_global_dtors_aux_fini_array_entry[]
- __attribute__ ((__unused__, section(".fini_array")))
+ __attribute__ ((__used__, section(".fini_array")))
= { __do_global_dtors_aux };
#endif /* !defined(FINI_SECTION_ASM_OP) */
@@ -348,7 +348,7 @@ frame_dummy (void)
CRT_CALL_STATIC_FUNCTION (INIT_SECTION_ASM_OP, frame_dummy)
#else /* defined(INIT_SECTION_ASM_OP) */
static func_ptr __frame_dummy_init_array_entry[]
- __attribute__ ((__unused__, section(".init_array")))
+ __attribute__ ((__used__, section(".init_array")))
= { frame_dummy };
#endif /* !defined(INIT_SECTION_ASM_OP) */
#endif /* USE_EH_FRAME_REGISTRY || JCR_SECTION_NAME */
@@ -456,7 +456,7 @@ CTOR_LIST_END;
#elif defined(CTORS_SECTION_ASM_OP)
/* Hack: force cc1 to switch to .data section early, so that assembling
__CTOR_LIST__ does not undo our behind-the-back change to .ctors. */
-static func_ptr force_to_data[1] __attribute__ ((__unused__)) = { };
+static func_ptr force_to_data[1] __attribute__ ((__used__)) = { };
asm (CTORS_SECTION_ASM_OP);
STATIC func_ptr __CTOR_END__[1]
__attribute__((aligned(sizeof(func_ptr
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r211730 - in head/usr.sbin/pc-sysinstall: backend backend-query pc-sysinstall
Author: imp
Date: Tue Aug 24 06:11:46 2010
New Revision: 211730
URL: http://svn.freebsd.org/changeset/base/211730
Log:
Indent things consistently
PR: 149926
Submitted by: John Hixson
Modified:
head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh
head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
head/usr.sbin/pc-sysinstall/backend-query/disk-part.sh
head/usr.sbin/pc-sysinstall/backend-query/enable-net.sh
head/usr.sbin/pc-sysinstall/backend-query/get-packages.sh
head/usr.sbin/pc-sysinstall/backend-query/list-packages.sh
head/usr.sbin/pc-sysinstall/backend-query/set-mirror.sh
head/usr.sbin/pc-sysinstall/backend-query/test-netup.sh
head/usr.sbin/pc-sysinstall/backend-query/update-part-list.sh
head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh
head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-models.sh
head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-variants.sh
head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
head/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh
head/usr.sbin/pc-sysinstall/backend/functions-disk.sh
head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
head/usr.sbin/pc-sysinstall/backend/functions-ftp.sh
head/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh
head/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh
head/usr.sbin/pc-sysinstall/backend/functions-localize.sh
head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
head/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh
head/usr.sbin/pc-sysinstall/backend/functions-networking.sh
head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
head/usr.sbin/pc-sysinstall/backend/functions-packages.sh
head/usr.sbin/pc-sysinstall/backend/functions-parse.sh
head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh
head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh
head/usr.sbin/pc-sysinstall/backend/functions-users.sh
head/usr.sbin/pc-sysinstall/backend/functions.sh
head/usr.sbin/pc-sysinstall/backend/parseconfig.sh
head/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh
Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh
==
--- head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh Tue Aug 24
00:23:40 2010(r211729)
+++ head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh Tue Aug 24
06:11:46 2010(r211730)
@@ -54,7 +54,6 @@ HEADS="${VAL}"
get_disk_sectors "${DISK}"
SECS="${VAL}"
-
# Now get the disks size in MB
KB="`diskinfo -v ${1} | grep 'bytes' | cut -d '#' -f 1 | tr -s '\t' ' ' | tr
-d ' '`"
MB=$(convert_byte_to_megabyte ${KB})
@@ -62,10 +61,9 @@ MB=$(convert_byte_to_megabyte ${KB})
# Now get the Controller Type
CTYPE="`dmesg | grep "^${1}:" | grep "B <" | cut -d '>' -f 2 | cut -d ' ' -f
3-10`"
-
echo "cylinders=${CYLS}"
echo "heads=${HEADS}"
echo "sectors=${SECS}"
-echo "size=$MB"
-echo "type=$CTYPE"
+echo "size=${MB}"
+echo "type=${CTYPE}"
Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
==
--- head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Tue Aug 24
00:23:40 2010(r211729)
+++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Tue Aug 24
06:11:46 2010(r211730)
@@ -26,16 +26,32 @@
# $FreeBSD$
ARGS=$1
+FLAGS_MD=""
+FLAGS_VERBOSE=""
+
+shift
+while [ -n "$1" ]
+do
+ case "$1" in
+-m)
+ FLAGS_MD=1
+ ;;
+-v)
+ FLAGS_VERBOSE=1
+ ;;
+ esac
+ shift
+done
# Create our device listing
SYSDISK=$(sysctl -n kern.disks)
-if [ "${ARGS}" = "-m" ]
+if [ -n "${FLAGS_MD}" ]
then
- MDS=`mdconfig -l`
- if [ -n "${MDS}" ]
- then
- SYSDISK="${SYSDISK} ${MDS}"
- fi
+ MDS=`mdconfig -l`
+ if [ -n "${MDS}" ]
+ then
+SYSDISK="${SYSDISK} ${MDS}"
+ fi
fi
# Now loop through these devices, and list the disk drives
@@ -47,7 +63,7 @@ do
# Make sure we don't find any cd devices
case "${DEV}" in
- acd[0-9]*|cd[0-9]*|scd[0-9]*) continue ;;
+acd[0-9]*|cd[0-9]*|scd[0-9]*) continue ;;
esac
# Check the dmesg output for some more info about this device
@@ -55,11 +71,17 @@ do
if [ -z "$NEWLINE" ]; then
NEWLINE=" "
fi
- if echo "${DEV}" | grep -E '^md[0-9]+' >/dev/null 2>/dev/null
+
+ if [ -n "${FLAGS_MD}" ] && echo "${DEV}" | grep -E '^md[0-9]+' >/dev/null
2>/dev/null
then
NEWLINE=" "
fi
+ if [ -n "${FLAGS_VERBOSE}" ]
+ then
+ :
+ fi
+
# Save the disk list
if [ ! -z "$DLIST" ]
then
Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-part.sh
==
--- head/usr.sbin/pc-sysinstall/backend-query/disk-part.sh Tue Aug 24
00:23:40 2010(r211729)
+++ head/usr.sbin/pc-sysinstall/backend-query/disk-part.sh Tue A
svn commit: r211731 - head/gnu/lib/libdialog
Author: imp
Date: Tue Aug 24 06:30:46 2010
New Revision: 211731
URL: http://svn.freebsd.org/changeset/base/211731
Log:
Create a checklist and call one of the *printw() functions from the
selected() callback. When the dialog first appears, you will not see
the printed statement on the dialog, if you move down one, you will,
move up again and it now appears. I am assuming that you call a
*printw() function on a line in the dialog box of course.
The fix, from the pr:
This is a hack at best, I looked at the redraw code in
dialog_checklist() and took the minimal amount of it out to do
a simple "refresh" right after the items are drawn. This
doesn't hurt anything and makes the library work like it
should. There is probably a better way however =).
PR: 148609
Submitted by: John Hixson
Modified:
head/gnu/lib/libdialog/checklist.c
Modified: head/gnu/lib/libdialog/checklist.c
==
--- head/gnu/lib/libdialog/checklist.c Tue Aug 24 06:11:46 2010
(r211730)
+++ head/gnu/lib/libdialog/checklist.c Tue Aug 24 06:30:46 2010
(r211731)
@@ -198,6 +198,24 @@ draw:
wnoutrefresh(dialog);
wmove(list, choice, check_x+1);
wrefresh(list);
+
+/*
+ * XXX Black magic voodoo that allows printing to the checklist
+ * window. For some reason, if this "refresh" code is not in
+ * place, printing to the window from the selected callback
+ * prints "behind" the checklist window. There is probably a
+ * better way to do this.
+ */
+draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2,
menubox_border_attr, menubox_attr);
+
+for (i = 0; i < max_choice; i++)
+ print_item(list, items[i * 3], items[i * 3 + 1], status[i], i, i ==
choice, DREF(ditems, i), list_width, item_x, check_x);
+print_arrows(dialog, scroll, list_height, item_no, box_x, box_y, check_x +
4, cur_x, cur_y);
+
+wmove(list, choice, check_x+1);
+wnoutrefresh(dialog);
+wrefresh(list);
+/* XXX Black magic XXX */
while (key != ESC) {
key = wgetch(dialog);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r211723 - in stable/8/usr.bin/calendar: . calendars calendars/ru_RU.KOI8-R
On 2010-08-24 00:09, Edwin Groothuis wrote: > Author: edwin > Date: Mon Aug 23 22:09:25 2010 > New Revision: 211723 > URL: http://svn.freebsd.org/changeset/base/211723 > > Log: > MFC of r205821 r205827 r205828 r205862 r205872 r205937 r206568 > MFC of r208825 r208826 r208827 r208828 r208829 r208943 > > r205821: > Long awaited update to the calendar system: ... > Modified: > stable/8/usr.bin/calendar/Makefile > stable/8/usr.bin/calendar/calendar.1 > stable/8/usr.bin/calendar/calendar.c > stable/8/usr.bin/calendar/calendar.h > stable/8/usr.bin/calendar/calendars/calendar.australia > stable/8/usr.bin/calendar/calendars/calendar.dutch > stable/8/usr.bin/calendar/calendars/calendar.freebsd > stable/8/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common > (contents, props changed) > stable/8/usr.bin/calendar/day.c > stable/8/usr.bin/calendar/io.c > stable/8/usr.bin/calendar/ostern.c > stable/8/usr.bin/calendar/paskha.c > stable/8/usr.bin/calendar/pathnames.h > Directory Properties: > stable/8/usr.bin/calendar/ (props changed) Hi Edwin, I think you forgot to add usr.bin/calendar/locale.c here? The tinderboxes complain: ===> usr.bin/calendar (depend) make: don't know how to make locale.c. Stop *** Error code 2 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
