svn commit: r335368 - head/share/misc
Author: pi (ports committer) Date: Tue Jun 19 12:16:19 2018 New Revision: 335368 URL: https://svnweb.freebsd.org/changeset/base/335368 Log: share/misc/organization.dot: updates - add krion, philip to postmaster@ - remove trhodes from donations@, email bounces Approved by: remko Modified: head/share/misc/organization.dot Modified: head/share/misc/organization.dot == --- head/share/misc/organization.dotTue Jun 19 11:28:50 2018 (r335367) +++ head/share/misc/organization.dotTue Jun 19 12:16:19 2018 (r335368) @@ -48,13 +48,13 @@ clusteradm [label="Cluster Administrators\nclusteradm@ dnsadm [label="DNS Administrators\ndns...@freebsd.org\nbillf, dg, ps,\nkensmith, peter"] mirroradmin [label="FTP/WWW Mirror Site Coordinators\nmirror-ad...@freebsd.org\nkuriyama, kensmith"] perforceadmin [label="Perforce Repository Administrators\nperforce-ad...@freebsd.org\nscottl, kensmith, gordon,\nrwatson, peter, dhw"] -postmaster [label="Postmaster Team\npostmas...@freebsd.org\ndhw, ler, pi, rea, remko, zi"] +postmaster [label="Postmaster Team\npostmas...@freebsd.org\ndhw, krion, ler, philip, pi, rea, remko, zi"] refadm [label="Reference Systems Administrators\nref...@freebsd.org\njake, billf, markm, simon,\nobrien, ps, kensmith,\npeter, dhw"] webmaster [label="Webmaster Team\nwebmas...@freebsd.org\ngjb, wblock, blackend,\ngabor, hrs, wosch"] # Misc hats go here alphabetically sorted -donations [label="Donations Team\ndonati...@freebsd.org\nwilko, gahr, pgolluci,\nobrien, trhodes, ds,\nrwatson"] +donations [label="Donations Team\ndonati...@freebsd.org\nwilko, gahr, pgolluci,\nobrien, ds,\nrwatson"] marketing [label="Marketing Team\nmarket...@freebsd.org\nSteven Beedle, Denise Ebery, deb,\njkoshy, dru, mwlucas, imp,\nKris Moore, murray, mattt,\nJeremy C. Reed, rwatson"] vendorrelations [label="Vendor Relations\nvendor-relati...@freebsd.org\ncore, FreeBSD Foundation"] ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r334991 - head/share/misc
Author: pi (ports committer) Date: Tue Jun 12 07:51:03 2018 New Revision: 334991 URL: https://svnweb.freebsd.org/changeset/base/334991 Log: Add hrs, meta and myself to share/misc/committers-ports.dot Approved by: remko Modified: head/share/misc/committers-ports.dot Modified: head/share/misc/committers-ports.dot == --- head/share/misc/committers-ports.dotTue Jun 12 07:31:59 2018 (r334990) +++ head/share/misc/committers-ports.dotTue Jun 12 07:51:03 2018 (r334991) @@ -123,6 +123,7 @@ gordon [label="Gordon Tetlow\ngor...@freebsd.org\n2014 grembo [label="Michael Gmelin\ngre...@freebsd.org\n2014/01/21"] gnn [label="George Neville-Neil\n...@freebsd.org\n2013/09/04"] hq [label="Herve Quiroz\n...@freebsd.org\n2004/08/05"] +hrs [label="Hiroki Sato\n...@freebsd.org\n2004/04/10"] ijliao [label="Ying-Chieh Liao\nijl...@freebsd.org\n2001/01/20"] itetcu [label="Ion-Mihai Tetcu\nite...@freebsd.org\n2006/06/07"] jacula [label="Giuseppe Pilichi\njac...@freebsd.org\n2010/04/05"] @@ -177,6 +178,7 @@ markus [label="Markus Brueffer\nmar...@freebsd.org\n20 martymac [label="Ganael Laplanche\nmarty...@freebsd.org\n2010/09/24"] mat [label="Mathieu Arnold\n...@freebsd.org\n2003/08/15"] matthew [label="Matthew Seaman\nmatt...@freebsd.org\n2012/02/07"] +meta [label="Koichiro Iwao\nm...@freebsd.org\n2018/03/19"] mezz [label="Jeremy Messenger\nm...@freebsd.org\n2004/04/30"] mfechner [label="Matthias Fechner\nmfech...@freebsd.org\n2018/03/01"] mharo [label="Michael Haro\nmh...@freebsd.org\n1999/04/13"] @@ -205,6 +207,7 @@ pclin [label="Po-Chien Lin\npc...@freebsd.org\n2013/02 pgj [label="Gabor Pali\n...@freebsd.org\n2009/04/12"] pgollucci [label="Philip M. Gollucci\npgollu...@freebsd.org\n2008/07/21"] philip [label="Philip Paeps\nphi...@freebsd.org\n2005/10/19"] +pi [label="Kurt Jaeger\n...@freebsd.org\n2014/03/14"] pizzamig [label="Luca Pizzamiglio\npizza...@freebsd.org\n2017/08/25"] rafan [label="Rong-En Fan\nra...@freebsd.org\n2006/06/23"] rakuco [label="Raphael Kubo da Costa\nrak...@freebsd.org\n2011/08/22"] @@ -351,6 +354,7 @@ cs -> kami culot -> danilo culot -> jase culot -> marino +culot -> pi culot -> wg db -> tj @@ -437,6 +441,8 @@ glarkin -> rm glewis -> hq glewis -> jkim +hrs -> meta + ijliao -> leeym imp -> dteske @@ -450,6 +456,7 @@ itetcu -> sylvio jadawin -> bapt jadawin -> flo jadawin -> olivier +jadawin -> pi jadawin -> riggs jadawin -> sbz jadawin -> wen @@ -491,6 +498,8 @@ ler -> leres lifanov -> ultima +linimon -> hrs + lioux -> pat lme -> pizzamig @@ -597,6 +606,7 @@ pgollucci -> swills philip -> koitsu +pi -> meta pi -> tz rafan -> chinsan ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r273734 - head/bin/dd
Hi! https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191263 Right now the submitter tests on 32bit and if time permits, I'll experiment on ARM as well. The submitter has provided a new patch, he tested it and, I tested it on - 10.0p10 amd64 - 10.1-RC3-i386 - 10.1-RC3-armv6 (raspberry-pi) All looks fine (I hope). Would some kind soul from the much more experienced src-committers please take up the PR, do some more testing and commit it ? Thanks very much! -- p...@freebsd.org +49 171 31013726 years to go ! ___ 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: r273734 - head/bin/dd
Hi! Dag-Erling Smørgrav d...@des.no writes: Kurt Jaeger p...@freebsd.org writes: I do not have a working arm setup right now. This is a bug on all platforms, and both clang and (recent) gcc should complain about it. That printf() call will print garbage. Correction: it will print garbage on 32-bit platforms, where sizeof(int) != sizeof(intmax_t), but clang and gcc should still emit a warning. Yes. I'm old enough to remember the mess in C when going from 16bit to 32bit that I should have paid attention to the test case on 32bit, but my stupidity won 8-( Right now the submitter tests on 32bit and if time permits, I'll experiment on ARM as well. Sorry again for the mess. -- p...@freebsd.org +49 171 31013726 years to go ! ___ 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: r273734 - head/bin/dd
Author: pi (ports committer)
Date: Mon Oct 27 11:38:17 2014
New Revision: 273734
URL: https://svnweb.freebsd.org/changeset/base/273734
Log:
bin/dd: Fix incorrect casting of arguments
dd(1) casts many of its numeric arguments from uintmax_t to intmax_t
and back again to detect whether or not the original arguments were
negative. This caused wrong behaviour in some boundary cases:
$ dd if=/dev/zero of=/dev/null count=18446744073709551615
dd: count cannot be negative
After the fix:
$ dd if=/dev/zero of=/dev/null count=18446744073709551615
dd: count: Result too large
PR: 191263
Submitted by: w...@worrbase.com
Approved by: cognet@
Modified:
head/bin/dd/args.c
head/bin/dd/conv.c
head/bin/dd/dd.c
head/bin/dd/dd.h
head/bin/dd/position.c
Modified: head/bin/dd/args.c
==
--- head/bin/dd/args.c Mon Oct 27 11:21:47 2014(r273733)
+++ head/bin/dd/args.c Mon Oct 27 11:38:17 2014(r273734)
@@ -41,6 +41,7 @@ __FBSDID($FreeBSD$);
#include sys/types.h
+#include ctype.h
#include err.h
#include errno.h
#include inttypes.h
@@ -171,8 +172,7 @@ jcl(char **argv)
*/
if (in.offset OFF_MAX / (ssize_t)in.dbsz ||
out.offset OFF_MAX / (ssize_t)out.dbsz)
- errx(1, seek offsets cannot be larger than %jd,
- (intmax_t)OFF_MAX);
+ errx(1, seek offsets cannot be larger than %jd, OFF_MAX);
}
static int
@@ -186,37 +186,30 @@ c_arg(const void *a, const void *b)
static void
f_bs(char *arg)
{
- uintmax_t res;
- res = get_num(arg);
- if (res 1 || res SSIZE_MAX)
- errx(1, bs must be between 1 and %jd, (intmax_t)SSIZE_MAX);
- in.dbsz = out.dbsz = (size_t)res;
+ in.dbsz = out.dbsz = get_num(arg);
+ if (out.dbsz 1 || out.dbsz SSIZE_MAX)
+ errx(1, bs must be between 1 and %jd, SSIZE_MAX);
}
static void
f_cbs(char *arg)
{
- uintmax_t res;
- res = get_num(arg);
- if (res 1 || res SSIZE_MAX)
- errx(1, cbs must be between 1 and %jd, (intmax_t)SSIZE_MAX);
- cbsz = (size_t)res;
+ cbsz = get_num(arg);
+ if (cbsz 1 || cbsz SSIZE_MAX)
+ errx(1, cbs must be between 1 and %jd, SSIZE_MAX);
}
static void
f_count(char *arg)
{
- intmax_t res;
- res = (intmax_t)get_num(arg);
- if (res 0)
- errx(1, count cannot be negative);
- if (res == 0)
- cpy_cnt = (uintmax_t)-1;
- else
- cpy_cnt = (uintmax_t)res;
+ cpy_cnt = get_num(arg);
+ if (cpy_cnt == SIZE_MAX)
+ errc(1, ERANGE, %s, oper);
+ if (cpy_cnt == 0)
+ cpy_cnt = -1;
}
static void
@@ -225,7 +218,7 @@ f_files(char *arg)
files_cnt = get_num(arg);
if (files_cnt 1)
- errx(1, files must be between 1 and %jd, (uintmax_t)-1);
+ errx(1, files must be between 1 and %ju, SIZE_MAX);
}
static void
@@ -241,14 +234,11 @@ f_fillchar(char *arg)
static void
f_ibs(char *arg)
{
- uintmax_t res;
if (!(ddflags C_BS)) {
- res = get_num(arg);
- if (res 1 || res SSIZE_MAX)
- errx(1, ibs must be between 1 and %jd,
- (intmax_t)SSIZE_MAX);
- in.dbsz = (size_t)res;
+ in.dbsz = get_num(arg);
+ if (in.dbsz 1 || in.dbsz SSIZE_MAX)
+ errx(1, ibs must be between 1 and %ju, SSIZE_MAX);
}
}
@@ -262,14 +252,11 @@ f_if(char *arg)
static void
f_obs(char *arg)
{
- uintmax_t res;
if (!(ddflags C_BS)) {
- res = get_num(arg);
- if (res 1 || res SSIZE_MAX)
- errx(1, obs must be between 1 and %jd,
- (intmax_t)SSIZE_MAX);
- out.dbsz = (size_t)res;
+ out.dbsz = get_num(arg);
+ if (out.dbsz 1 || out.dbsz SSIZE_MAX)
+ errx(1, obs must be between 1 and %jd, SSIZE_MAX);
}
}
@@ -378,11 +365,17 @@ get_num(const char *val)
uintmax_t num, mult, prevnum;
char *expr;
+ while (isspace(val[0]))
+ val++;
+
+ if (val[0] == '-')
+ errx(1, %s: cannot be negative, oper);
+
errno = 0;
- num = strtouq(val, expr, 0);
+ num = strtoull(val, expr, 0);
if (errno != 0) /* Overflow or underflow. */
err(1, %s, oper);
-
+
if (expr == val)/* No valid digits. */
errx(1, %s: illegal numeric value, oper);
Modified: head/bin/dd/conv.c
==
--- head/bin/dd/conv.c Mon Oct 27 11:21:47 2014(r273733)
+++ head/bin/dd/conv.c Mon Oct
Re: svn commit: r273734 - head/bin/dd
On Mon, Oct 27, 2014 at 11:38:17AM +, Kurt Jaeger wrote: Author: pi (ports committer) Date: Mon Oct 27 11:38:17 2014 New Revision: 273734 URL: https://svnweb.freebsd.org/changeset/base/273734 Log: bin/dd: Fix incorrect casting of arguments This causes non-trivial amount of errors like cc1: warnings being treated as errors /scratch/tmp/kib/src/bin/dd/args.c: In function 'f_bs': /scratch/tmp/kib/src/bin/dd/args.c:192: warning: format '%jd' expects type 'intm ax_t', but argument 3 has type 'int' (this is on arm). Thanks for the pointer. I'll take it up with the submitter. I do not have a working arm setup right now. -- p...@freebsd.org +49 171 31013726 years to go ! ___ 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: r273734 - head/bin/dd
Hi! Log: bin/dd: Fix incorrect casting of arguments [...] Both of these work correctly in my version (with a relatively small patch and no breakage of other cases). (I actually typed large values as -1 and 11. -1 means (uintmax_t)-1 although this is undocumented and now broken). So, given this detailed review, should I revert the change ? -- p...@freebsd.org +49 171 31013726 years to go ! ___ 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: r273743 - head/bin/dd
Author: pi (ports committer)
Date: Mon Oct 27 17:39:37 2014
New Revision: 273743
URL: https://svnweb.freebsd.org/changeset/base/273743
Log:
bin/dd: revert 273734, as it fails on 32bit platforms
Revert: insufficient testing on 32bit platforms
PR: 191263
Modified:
head/bin/dd/args.c
head/bin/dd/conv.c
head/bin/dd/dd.c
head/bin/dd/dd.h
head/bin/dd/position.c
Modified: head/bin/dd/args.c
==
--- head/bin/dd/args.c Mon Oct 27 16:15:15 2014(r273742)
+++ head/bin/dd/args.c Mon Oct 27 17:39:37 2014(r273743)
@@ -41,7 +41,6 @@ __FBSDID($FreeBSD$);
#include sys/types.h
-#include ctype.h
#include err.h
#include errno.h
#include inttypes.h
@@ -172,7 +171,8 @@ jcl(char **argv)
*/
if (in.offset OFF_MAX / (ssize_t)in.dbsz ||
out.offset OFF_MAX / (ssize_t)out.dbsz)
- errx(1, seek offsets cannot be larger than %jd, OFF_MAX);
+ errx(1, seek offsets cannot be larger than %jd,
+ (intmax_t)OFF_MAX);
}
static int
@@ -186,30 +186,37 @@ c_arg(const void *a, const void *b)
static void
f_bs(char *arg)
{
+ uintmax_t res;
- in.dbsz = out.dbsz = get_num(arg);
- if (out.dbsz 1 || out.dbsz SSIZE_MAX)
- errx(1, bs must be between 1 and %jd, SSIZE_MAX);
+ res = get_num(arg);
+ if (res 1 || res SSIZE_MAX)
+ errx(1, bs must be between 1 and %jd, (intmax_t)SSIZE_MAX);
+ in.dbsz = out.dbsz = (size_t)res;
}
static void
f_cbs(char *arg)
{
+ uintmax_t res;
- cbsz = get_num(arg);
- if (cbsz 1 || cbsz SSIZE_MAX)
- errx(1, cbs must be between 1 and %jd, SSIZE_MAX);
+ res = get_num(arg);
+ if (res 1 || res SSIZE_MAX)
+ errx(1, cbs must be between 1 and %jd, (intmax_t)SSIZE_MAX);
+ cbsz = (size_t)res;
}
static void
f_count(char *arg)
{
+ intmax_t res;
- cpy_cnt = get_num(arg);
- if (cpy_cnt == SIZE_MAX)
- errc(1, ERANGE, %s, oper);
- if (cpy_cnt == 0)
- cpy_cnt = -1;
+ res = (intmax_t)get_num(arg);
+ if (res 0)
+ errx(1, count cannot be negative);
+ if (res == 0)
+ cpy_cnt = (uintmax_t)-1;
+ else
+ cpy_cnt = (uintmax_t)res;
}
static void
@@ -218,7 +225,7 @@ f_files(char *arg)
files_cnt = get_num(arg);
if (files_cnt 1)
- errx(1, files must be between 1 and %ju, SIZE_MAX);
+ errx(1, files must be between 1 and %jd, (uintmax_t)-1);
}
static void
@@ -234,11 +241,14 @@ f_fillchar(char *arg)
static void
f_ibs(char *arg)
{
+ uintmax_t res;
if (!(ddflags C_BS)) {
- in.dbsz = get_num(arg);
- if (in.dbsz 1 || in.dbsz SSIZE_MAX)
- errx(1, ibs must be between 1 and %ju, SSIZE_MAX);
+ res = get_num(arg);
+ if (res 1 || res SSIZE_MAX)
+ errx(1, ibs must be between 1 and %jd,
+ (intmax_t)SSIZE_MAX);
+ in.dbsz = (size_t)res;
}
}
@@ -252,11 +262,14 @@ f_if(char *arg)
static void
f_obs(char *arg)
{
+ uintmax_t res;
if (!(ddflags C_BS)) {
- out.dbsz = get_num(arg);
- if (out.dbsz 1 || out.dbsz SSIZE_MAX)
- errx(1, obs must be between 1 and %jd, SSIZE_MAX);
+ res = get_num(arg);
+ if (res 1 || res SSIZE_MAX)
+ errx(1, obs must be between 1 and %jd,
+ (intmax_t)SSIZE_MAX);
+ out.dbsz = (size_t)res;
}
}
@@ -365,17 +378,11 @@ get_num(const char *val)
uintmax_t num, mult, prevnum;
char *expr;
- while (isspace(val[0]))
- val++;
-
- if (val[0] == '-')
- errx(1, %s: cannot be negative, oper);
-
errno = 0;
- num = strtoull(val, expr, 0);
+ num = strtouq(val, expr, 0);
if (errno != 0) /* Overflow or underflow. */
err(1, %s, oper);
-
+
if (expr == val)/* No valid digits. */
errx(1, %s: illegal numeric value, oper);
Modified: head/bin/dd/conv.c
==
--- head/bin/dd/conv.c Mon Oct 27 16:15:15 2014(r273742)
+++ head/bin/dd/conv.c Mon Oct 27 17:39:37 2014(r273743)
@@ -133,7 +133,7 @@ block(void)
*/
ch = 0;
for (inp = in.dbp - in.dbcnt, outp = out.dbp; in.dbcnt;) {
- maxlen = MIN(cbsz, (size_t)in.dbcnt);
+ maxlen = MIN(cbsz, in.dbcnt);
if ((t = ctab) != NULL)
for (cnt = 0; cnt maxlen (ch = *inp++) != '\n';
++cnt)
Re: svn commit: r273734 - head/bin/dd
Hi! So, given this detailed review, should I revert the change ? Yes. You would have to change half of it just to get it to compile on 32-bit arches. Done. It's clearly my fault, I was sloppy in testing 8-( -- p...@freebsd.org +49 171 31013726 years to go ! ___ 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
