Hi,
This proposal from
<https://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00167.html>
met agreement:
> I'd suggest to rename 'strftime' to 'strftime-gnu' or 'nstrftime', and mark
> the 'strftime' module obsolete for two years, then after two years remove it.
> So that all users of this module have enough time to notice the change.
So I'm implementing it.
2017-07-23 Bruno Haible <br...@clisp.org>
Rename module 'strftime' to 'nstrftime'.
* m4/nstrftime.m4: Renamed from m4/strftime.m4.
* lib/nstrftime.c: Renamed from lib/strftime.c.
* modules/nstrftime: Renamed from modules/strftime.
(Files, Makefile.am): Update.
* tests/test-nstrftime.c: Renamed from tests/test-strftime.c.
Fix comment.
* modules/nstrftime-tests: Renamed from modules/strftime-tests.
(Files, Makefile.am): Update.
* modules/strftime: New file, an obsolete indirection.
* doc/posix-functions/strftime.texi: Update reference.
* config/srclist.txt: Update info.
diff --git a/modules/nstrftime b/modules/nstrftime
index b54f44e..b559b5e 100644
--- a/modules/nstrftime
+++ b/modules/nstrftime
@@ -3,9 +3,9 @@ nstrftime() function: convert date and time to string, with GNU
extensions.
Files:
lib/strftime.h
-lib/strftime.c
+lib/nstrftime.c
m4/tm_gmtoff.m4
-m4/strftime.m4
+m4/nstrftime.m4
Depends-on:
extensions
@@ -16,7 +16,7 @@ configure.ac:
gl_FUNC_GNU_STRFTIME
Makefile.am:
-lib_SOURCES += strftime.c
+lib_SOURCES += nstrftime.c
Include:
"strftime.h"
diff --git a/modules/nstrftime-tests b/modules/nstrftime-tests
index 17f7001..708b510 100644
--- a/modules/nstrftime-tests
+++ b/modules/nstrftime-tests
@@ -1,5 +1,5 @@
Files:
-tests/test-strftime.c
+tests/test-nstrftime.c
tests/macros.h
Depends-on:
@@ -8,5 +8,5 @@ strerror
configure.ac:
Makefile.am:
-TESTS += test-strftime
-check_PROGRAMS += test-strftime
+TESTS += test-nstrftime
+check_PROGRAMS += test-nstrftime
diff --git a/tests/test-nstrftime.c b/tests/test-nstrftime.c
index 102e168..85af8a6 100644
--- a/tests/test-nstrftime.c
+++ b/tests/test-nstrftime.c
@@ -1,4 +1,4 @@
-/* Test that posixtime works as required.
+/* Test that nstrftime works as required.
Copyright (C) 2011-2017 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/config/srclist.txt b/config/srclist.txt
index ae24d4a..bf6e4a2 100644
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -233,7 +233,7 @@ $GETTEXT gettext-runtime/po/remove-potcdate.sin
build-aux/po release
#$LIBCSRC sysdeps/unix/bsd/unlockpt.c lib gpl
#$LIBCSRC sysdeps/unix/dirfd.c lib gpl
#$LIBCSRC sysdeps/unix/grantpt.c lib gpl
-#$LIBCSRC sysdeps/unix/rmdir.c lib gpl
+#$LIBCSRC sysdeps/unix/rmdir.c lib gpl (nstrftime.c in gnulib)
#$LIBCSRC time/strftime.c lib gpl
# These are close, but we are using the gettext versions.
#$LIBCSRC misc/mkdtemp.c lib gpl
diff --git a/doc/posix-functions/strftime.texi
b/doc/posix-functions/strftime.texi
index dd52720..40e391a 100644
--- a/doc/posix-functions/strftime.texi
+++ b/doc/posix-functions/strftime.texi
@@ -24,5 +24,5 @@ Native Windows platforms (mingw, MSVC) support only a subset
of time
zones supported by GNU or specified by POSIX. @xref{tzset}.
@end itemize
-Extension: Gnulib offers a module @samp{strftime} that provides an
+Extension: Gnulib offers a module @samp{nstrftime} that provides an
@code{nstrftime} function with various GNU extensions.
============================= modules/strftime =============================
Description:
nstrftime() function: convert date and time to string, with GNU extensions.
Status:
obsolete
Notice:
This module is obsolete. Use module 'nstrftime' instead.
Files:
Depends-on:
nstrftime
configure.ac:
Makefile.am:
Include:
"strftime.h"
License:
LGPL
Maintainer:
all
