Reorganise, make it just one function, remove -v option it didnt work properly anyway...

[oweals/busybox.git] / coreutils / cal.c

diff --git a/coreutils/cal.c b/coreutils/cal.c
index f6578bf430cad8f9929bbbba8522989572efe246..ab631576a9f9e7436b3afb09621d639fdff50a36 100644 (file)
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -372,7 +372,7 @@ void trim_trailing_spaces(char *s)
 
        for (p = s; *p; ++p)
                continue;
-       while (p > s && isspace(*--p))
+       while (p > s && (--p, isspace(*p)))
                continue;
        if (p > s)
                ++p;
@@ -404,11 +404,7 @@ void center(char *str, int len, int separate)
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *