Suppress compiler warning, update history, and bump version.

diff --git a/Makefile b/Makefile
index 30550bfa605ccb0c6577be847498066b56b12814..17e4c9f18527483f58c75ea8acf86e514d95654a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,9 @@ cstrings: cstrings.l
 cstrings.1: cstrings.xml
        xmlto man cstrings.xml
 
+cstrings.html: cstrings.xml
+       xmlto html-nochunks cstrings.xml
+
 install: cstrings.1 uninstall
        cp cstrings /usr/bin
        cp cstrings.1 /usr/share/man/man1/cstrings.1

diff --git a/cstrings.l b/cstrings.l
index 013b0f49f81a91cd70c7ce1783e9c0483e2ff081..855f38bb7d0ad45134c7cbed8f21396060ae330c 100644 (file)
--- a/cstrings.l
+++ b/cstrings.l
@@ -276,8 +276,13 @@ char *argv[];
                (void) printf("%s:\n", argv[optind]);
            else
            {
-               if (argv[optind][0] != '/')
-                   (void) getcwd(buf, BUFSIZ);
+               if (argv[optind][0] != '/') {
+                   if (getcwd(buf, BUFSIZ) != 0)
+                   {
+                       perror("cstrings, getting current directory");
+                       exit(1);
+                   }
+               }
                else
                    buf[0] = '\0';
                (void) strcat(buf, argv[optind]);

diff --git a/cstrings.spec b/cstrings.spec
index b23c3049a133665c82a7a228bb063c96619d5258..c226e2386a41b7f426182c43b8c52c39fa50ea1f 100644 (file)
--- a/cstrings.spec
+++ b/cstrings.spec
@@ -1,5 +1,5 @@
 Name: cstrings 
-Version: 2.3
+Version: 2.4
 Release: 1
 URL: http://www.catb.org/~esr/cstrings/
 Source0: %{name}-%{version}.tar.gz
@@ -7,7 +7,7 @@ License: GPL
 Group: Development/Tools
 Summary: quick-and-dirty C code internationalization tool
 BuildRoot: %{_tmppath}/%{name}-root
-#Keywords: internationalization, C, programming
+#Project-Tag-List: internationalization, C, programming
 
 %description
 A lightweight internationalization tool for C code, for those who find
@@ -38,6 +38,9 @@ cp cstrings.1 "$RPM_BUILD_ROOT"%{_mandir}/man1/
 %{_mandir}/man1/cstrings.1*
 
 %changelog
+* Tue Oct 19 2010 Eric S. Raymond <esr@snark.thyrsus.com> 2.4-1
+- Banish some warnings generated by modern compilers.
+
 * Mon Dec 29 2003 Eric S. Raymond <esr@snark.thyrsus.com> 2.3-1
 - Use mkstemp(3) rather than tempnam(3) for security's sake.
 - Source RPMs no longer depend on --define myversion.

diff --git a/cstrings.xml b/cstrings.xml
index 40bcf75ccba12a03d56becff6b8651e6cf4bb5eb..554496f01d8a9d61160e2d69e26040f5be49f954 100644 (file)
--- a/cstrings.xml
+++ b/cstrings.xml
@@ -7,6 +7,9 @@
 <refentrytitle>cstrings</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='date'>July 10, 1990</refmiscinfo>
+<refmiscinfo class='productname'>cstrings</refmiscinfo>
+<refmiscinfo class='source'>cstrings</refmiscinfo>
+<refmiscinfo class='manual'>Development Tools</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>cstrings </refname>