[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[coreutils] [PATCH] build: complete the rename of get_date
From: |
Eric Blake |
Subject: |
[coreutils] [PATCH] build: complete the rename of get_date |
Date: |
Tue, 5 Oct 2010 12:13:30 -0600 |
* gnulib: Update to latest.
* src/date.c (includes, batch_convert, main): Track rename.
* src/touch.c (includes, get_reldate): Likewise.
* doc/coreutils.texi (Top, Date input formats): Likewise.
* bootstrap.conf (gnulib_modules): Likewise.
* doc/Makefile.am (EXTRA_DIST): Likewise.
* doc/.gitignore: Likewise.
* bootstrap: Synchronize from upstream.
---
I'm pushing this, now that the gnulib get_date() rename is complete.
It also fixes the minor 'bootstrap' regression on Solaris from my
last gnulib update.
bootstrap | 4 ++--
bootstrap.conf | 2 +-
doc/.gitignore | 1 +
doc/Makefile.am | 2 +-
doc/coreutils.texi | 4 ++--
gnulib | 2 +-
src/date.c | 6 +++---
src/touch.c | 4 ++--
8 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/bootstrap b/bootstrap
index 29802a1..49b1e55 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2010-10-05.14; # UTC
+scriptversion=2010-10-05.15; # UTC
# Bootstrap this package from checked-out sources.
@@ -351,7 +351,7 @@ check_versions() {
app=libtoolize
fi
# Honor $APP variables ($TAR, $AUTOCONF, etc.)
- appvar=`echo $app | tr 'a-z-' 'A-Z_'`
+ appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
test "$appvar" = TAR && appvar=AMTAR
eval "app=\${$appvar-$app}"
inst_ver=$(get_version $app)
diff --git a/bootstrap.conf b/bootstrap.conf
index a206629..18ef914 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -89,7 +89,6 @@ gnulib_modules="
fsync
ftello
fts
- get_date
getgroups
gethrxtime
getline
@@ -154,6 +153,7 @@ gnulib_modules="
netinet_in
nproc
obstack
+ parse-datetime
pathmax
perl
physmem
diff --git a/doc/.gitignore b/doc/.gitignore
index f224ac7..7eca8d1 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -19,5 +19,6 @@ fdl.texi
gendocs_template
get_date.texi
getdate.texi
+parse-datetime.texi
stamp-vti
version.texi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e58f173..d627b63 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,7 +17,7 @@
info_TEXINFOS = coreutils.texi
-EXTRA_DIST = perm.texi get_date.texi constants.texi fdl.texi
+EXTRA_DIST = perm.texi parse-datetime.texi constants.texi fdl.texi
# The following is necessary if the package name is 8 characters or longer.
# If the info documentation would be split into 10 or more separate files,
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index f4b7630..4d17ed1 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -474,7 +474,7 @@ Top
* Pure numbers in date strings:: 19931219, 1440
* Seconds since the Epoch:: @@1078100502
* Specifying time zone rules:: TZ="America/New_York", TZ="UTC0"
-* Authors of get_date:: Bellovin, Eggert, Salz, Berets, et al
+* Authors of parse_datetime:: Bellovin, Eggert, Salz, Berets, et al
Opening the software toolbox
@@ -15678,7 +15678,7 @@ File permissions
@chapter File permissions
@include perm.texi
-@include get_date.texi
+@include parse-datetime.texi
@c What's GNU?
@c Arnold Robbins
diff --git a/gnulib b/gnulib
index ae0a6b2..2bb63bf 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit ae0a6b2df106b7ed760cc393312997adf995cc3b
+Subproject commit 2bb63bfb25474ea147ee9f1523c0337997359a4c
diff --git a/src/date.c b/src/date.c
index 42f3348..ad9b490 100644
--- a/src/date.c
+++ b/src/date.c
@@ -27,7 +27,7 @@
#include "system.h"
#include "argmatch.h"
#include "error.h"
-#include "getdate.h"
+#include "parse-datetime.h"
#include "posixtm.h"
#include "quote.h"
#include "stat-time.h"
@@ -281,7 +281,7 @@ batch_convert (const char *input_filename, const char
*format)
break;
}
- if (! get_date (&when, line, NULL))
+ if (! parse_datetime (&when, line, NULL))
{
if (line[line_length - 1] == '\n')
line[line_length - 1] = '\0';
@@ -500,7 +500,7 @@ main (int argc, char **argv)
{
if (set_datestr)
datestr = set_datestr;
- valid_date = get_date (&when, datestr, NULL);
+ valid_date = parse_datetime (&when, datestr, NULL);
}
}
diff --git a/src/touch.c b/src/touch.c
index 6358b89..f9374c0 100644
--- a/src/touch.c
+++ b/src/touch.c
@@ -28,7 +28,7 @@
#include "argmatch.h"
#include "error.h"
#include "fd-reopen.h"
-#include "getdate.h"
+#include "parse-datetime.h"
#include "posixtm.h"
#include "posixver.h"
#include "quote.h"
@@ -112,7 +112,7 @@ static void
get_reldate (struct timespec *result,
char const *flex_date, struct timespec const *now)
{
- if (! get_date (result, flex_date, now))
+ if (! parse_datetime (result, flex_date, now))
error (EXIT_FAILURE, 0, _("invalid date format %s"), quote (flex_date));
}
--
1.7.2.3
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [coreutils] [PATCH] build: complete the rename of get_date,
Eric Blake <=