On 28/06/15 21:01, Jim Meyering wrote: > From 8fc96e0a280211e7cdf0da5b685c1ec6b7668f78 Mon Sep 17 00:00:00 2001 > From: Jim Meyering <[email protected]> > Date: Sun, 28 Jun 2015 10:17:57 -0700 > Subject: [PATCH 1/2] maint: factor.c: touch up preceding change > > * src/factor.c (print_factors_single): Add a "const" attribute. > Make "n_out" a more faithful count of output bytes. > --- > src/factor.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/factor.c b/src/factor.c > index 60cf898..5b73c90 100644 > --- a/src/factor.c > +++ b/src/factor.c > @@ -2364,9 +2364,9 @@ print_factors_single (uintmax_t t1, uintmax_t t0) > { > char buf[INT_BUFSIZE_BOUND (uintmax_t)]; > putchar (' '); > - char *umaxstr = umaxtostr (factors.p[j], buf); > + char const *umaxstr = umaxtostr (factors.p[j], buf); > fputs (umaxstr, stdout); > - n_out += strlen (umaxstr) + 1; > + n_out += 1 + strlen (umaxstr) + 1;
Is the extra 1 really required? The trailing one was there to cater for the putchar(). > 0002-maint-stdbuf.c-avoid-the-OS-X-putenv-function.patch > > > From 566ade5622427999aa9f03c63565bcb763e0a895 Mon Sep 17 00:00:00 2001 > From: Jim Meyering <[email protected]> > Date: Sun, 28 Jun 2015 10:35:04 -0700 > Subject: [PATCH 2/2] maint: stdbuf.c: avoid the OS X putenv function > > * src/stdbuf.c (set_LD_PRELOAD) [__APPLE__]: Use the OS X setenv > function, rather than putenv, per that documentation: > https://developer.apple.com/\ > library/mac/documentation/Darwin/Reference/ManPages/man3/putenv.3.html > --- > src/stdbuf.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/stdbuf.c b/src/stdbuf.c > index fe4d773..116619d 100644 > --- a/src/stdbuf.c > +++ b/src/stdbuf.c > @@ -256,7 +256,7 @@ set_LD_PRELOAD (void) > ret = putenv (LD_PRELOAD); > #ifdef __APPLE__ > if (ret == 0) > - ret = putenv ("DYLD_FORCE_FLAT_NAMESPACE=y"); > + ret = setenv ("DYLD_FORCE_FLAT_NAMESPACE", "y", 1); > #endif Cool. I see setenv() is also used in split. We probably should add an explicit depends in bootstrap.conf rather than depending on the incidental parse-datetime dependency. thanks! Pádraig
