Allow 'gzip -d' and 'bzip2 -d' without gunzip or bunzip2
[oweals/busybox.git] / coreutils / cal.c
index ab631576a9f9e7436b3afb09621d639fdff50a36..af02608f035d58eb1f2f7162c2c5aeae403f0638 100644 (file)
@@ -1,88 +1,71 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Calendar implementation for busybox
  *
- * Copyright (C) 2001 by Steven J. Merrifield <steve@labyrinth.net.au>
- *
  * See original copyright at the end of this file
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
  *
-*/
-       
-
-#include <sys/types.h>
-#include <ctype.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "busybox.h"
-
-#ifdef CONFIG_LOCALE_SUPPORT
-#include <locale.h>
-#endif
+ * Major size reduction... over 50% (>1.5k) on i386.
+ */
+//config:config CAL
+//config:      bool "cal"
+//config:      default y
+//config:      help
+//config:        cal is used to display a monthly calendar.
+
+//applet:IF_CAL(APPLET(cal, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_CAL) += cal.o
+
+/* BB_AUDIT SUSv3 compliant with -j and -y extensions (from util-linux). */
+/* BB_AUDIT BUG: The output of 'cal -j 1752' is incorrect.  The upstream
+ * BB_AUDIT BUG: version in util-linux seems to be broken as well. */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/cal.html */
+
+//usage:#define cal_trivial_usage
+//usage:       "[-jy] [[MONTH] YEAR]"
+//usage:#define cal_full_usage "\n\n"
+//usage:       "Display a calendar\n"
+//usage:     "\n       -j      Use julian dates"
+//usage:     "\n       -y      Display the entire year"
+
+#include "libbb.h"
+#include "unicode.h"
+
+/* We often use "unsigned" intead of "int", it's easier to div on most CPUs */
 
 #define        THURSDAY                4               /* for reformation */
-#define        SATURDAY                6               /* 1 Jan 1 was a Saturday */
+#define        SATURDAY                6               /* 1 Jan 1 was a Saturday */
 
-#define        FIRST_MISSING_DAY       639787          /* 3 Sep 1752 */
-#define        NUMBER_MISSING_DAYS     11              /* 11 day correction */
+#define        FIRST_MISSING_DAY       639787          /* 3 Sep 1752 */
+#define        NUMBER_MISSING_DAYS     11              /* 11 day correction */
 
 #define        MAXDAYS                 42              /* max slots in a month array */
 #define        SPACE                   -1              /* used in day array */
 
-static int days_in_month[2][13] = {
-       {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
-       {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
+static const unsigned char days_in_month[] ALIGN1 = {
+       0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
 };
 
-int sep1752[MAXDAYS] = {
-       SPACE,  SPACE,  1,      2,      14,     15,     16,
+static const unsigned char sep1752[] ALIGN1 = {
+               1,      2,      14,     15,     16,
        17,     18,     19,     20,     21,     22,     23,
-       24,     25,     26,     27,     28,     29,     30,
-       SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,
-       SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,
-       SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,
-}, j_sep1752[MAXDAYS] = {
-       SPACE,  SPACE,  245,    246,    258,    259,    260,
-       261,    262,    263,    264,    265,    266,    267,
-       268,    269,    270,    271,    272,    273,    274,
-       SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,
-       SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,
-       SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,
-}, empty[MAXDAYS] = {
-       SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,
-       SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,
-       SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,
-       SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,
-       SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,
-       SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,  SPACE,
+       24,     25,     26,     27,     28,     29,     30
 };
 
-char *month_names[12];
-
-char day_headings[] = "                    ";
-char j_day_headings[] = "                           ";
+/* Set to 0 or 1 in main */
+#define julian ((unsigned)option_mask32)
 
-/* leap year -- account for gregorian reformation in 1752 */
-#define        leap_year(yr) \
-       ((yr) <= 1752 ? !((yr) % 4) : \
-       (!((yr) % 4) && ((yr) % 100)) || !((yr) % 400))
+/* leap year -- account for Gregorian reformation in 1752 */
+static int leap_year(unsigned yr)
+{
+       if (yr <= 1752)
+               return !(yr % 4);
+       return (!(yr % 4) && (yr % 100)) || !(yr % 400);
+}
 
 /* number of centuries since 1700, not inclusive */
 #define        centuries_since_1700(yr) \
@@ -96,178 +79,150 @@ char j_day_headings[] = "                           ";
 #define        leap_years_since_year_1(yr) \
        ((yr) / 4 - centuries_since_1700(yr) + quad_centuries_since_1700(yr))
 
-int julian;
-void ascii_day __P((char *, int));
-void center __P((char *, int, int));
-void day_array __P((int, int, int *));
-int day_in_week __P((int, int, int));
-int day_in_year __P((int, int, int));
-void j_yearly __P((int));
-void monthly __P((int, int));
-void trim_trailing_spaces __P((char *));
-void yearly __P((int));
-
-int cal_main(int argc, char **argv)
+static void center(char *, unsigned, unsigned);
+static void day_array(unsigned, unsigned, unsigned *);
+static void trim_trailing_spaces_and_print(char *);
+
+static void blank_string(char *buf, size_t buflen);
+static char *build_row(char *p, unsigned *dp);
+
+#define        DAY_LEN         3               /* 3 spaces per day */
+#define        J_DAY_LEN       (DAY_LEN + 1)
+#define        WEEK_LEN        20              /* 7 * 3 - one space at the end */
+#define        J_WEEK_LEN      (WEEK_LEN + 7)
+#define        HEAD_SEP        2               /* spaces between day headings */
+
+int cal_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int cal_main(int argc UNUSED_PARAM, char **argv)
 {
-       struct tm *local_time;
-       static struct tm zero_tm;
+       struct tm zero_tm;
        time_t now;
-       int ch, month, year, yflag, i;
+       unsigned month, year, flags, i;
+       char *month_names[12];
+       /* normal heading: */
+       /* "Su Mo Tu We Th Fr Sa" */
+       /* -j heading: */
+       /* " Su  Mo  Tu  We  Th  Fr  Sa" */
+       char day_headings[ENABLE_UNICODE_SUPPORT ? 28 * 6 : 28];
+       IF_UNICODE_SUPPORT(char *hp = day_headings;)
        char buf[40];
 
-#ifdef CONFIG_LOCALE_SUPPORT
-       setlocale(LC_TIME, "");
-#endif
+       init_unicode();
 
-       yflag = 0;
-       while ((ch = getopt(argc, argv, "jy")) != -1)
-               switch(ch) {
-               case 'j':
-                       julian = 1;
-                       break;
-               case 'y':
-                       yflag = 1;
-                       break;
-               default:
-                       show_usage();
-               }
-       argc -= optind;
+       flags = getopt32(argv, "jy");
+       /* This sets julian = flags & 1: */
+       option_mask32 &= 1;
+       month = 0;
        argv += optind;
 
-       month = 0;
-       switch(argc) {
-       case 2:
-               if ((month = atoi(*argv++)) < 1 || month > 12)
-                       error_msg_and_die("Illegal month value: use 1-12");
-               /* FALLTHROUGH */
-       case 1:
-               if ((year = atoi(*argv)) < 1 || year > 9999)
-                       error_msg_and_die("Illegal year value: use 1-9999");
-               break;
-       case 0:
+       if (!argv[0]) {
+               struct tm *ptm;
+
                time(&now);
-               local_time = localtime(&now);
-               year = local_time->tm_year + 1900;
-               if (!yflag)
-                       month = local_time->tm_mon + 1;
-               break;
-       default:
-               show_usage();
+               ptm = localtime(&now);
+               year = ptm->tm_year + 1900;
+               if (!(flags & 2)) { /* no -y */
+                       month = ptm->tm_mon + 1;
+               }
+       } else {
+               if (argv[1]) {
+                       if (argv[2]) {
+                               bb_show_usage();
+                       }
+                       if (!(flags & 2)) { /* no -y */
+                               month = xatou_range(*argv, 1, 12);
+                       }
+                       argv++;
+               }
+               year = xatou_range(*argv, 1, 9999);
        }
 
-       for (i = 0; i < 12; i++) {
+       blank_string(day_headings, sizeof(day_headings) - 7 + 7*julian);
+
+       i = 0;
+       do {
                zero_tm.tm_mon = i;
+               /* full month name according to locale */
                strftime(buf, sizeof(buf), "%B", &zero_tm);
                month_names[i] = xstrdup(buf);
-       }
-       for (i = 0; i < 7; i++) {
-               zero_tm.tm_wday = i;
-               strftime(buf, sizeof(buf), "%a", &zero_tm);
-               strncpy(day_headings + i * 3, buf, 2);
-               strncpy(j_day_headings + i * 4 + 1, buf, 2);
-       }
-
-       if (month)
-               monthly(month, year);
-       else if (julian)
-               j_yearly(year);
-       else
-               yearly(year);
-       exit(0);
-}
-
-#define        DAY_LEN         3               /* 3 spaces per day */
-#define        J_DAY_LEN       4               /* 4 spaces per day */
-#define        WEEK_LEN        20              /* 7 * 3 - one space at the end */
-#define        J_WEEK_LEN      27              /* 7 * 4 - one space at the end */
-#define        HEAD_SEP        2               /* spaces between day headings */
-#define        J_HEAD_SEP      2
-
-void monthly(int month, int year)
-{
-       int col, row, len, days[MAXDAYS];
-       char *p, lineout[30];
-
-       day_array(month, year, days);
-       len = sprintf(lineout, "%s %d", month_names[month - 1], year);
-       printf("%*s%s\n%s\n",
-           ((julian ? J_WEEK_LEN : WEEK_LEN) - len) / 2, "",
-           lineout, julian ? j_day_headings : day_headings);
-       for (row = 0; row < 6; row++) {
-               for (col = 0, p = lineout; col < 7; col++,
-                   p += julian ? J_DAY_LEN : DAY_LEN)
-                       ascii_day(p, days[row * 7 + col]);
-               *p = '\0';
-               trim_trailing_spaces(lineout);
-               printf("%s\n", lineout);
-       }
-}
 
-void j_yearly(int year)
-{
-       int col, *dp, i, month, row, which_cal;
-       int days[12][MAXDAYS];
-       char *p, lineout[80];
-
-       sprintf(lineout, "%d", year);
-       center(lineout, J_WEEK_LEN * 2 + J_HEAD_SEP, 0);
-       printf("\n\n");
-       for (i = 0; i < 12; i++)
-               day_array(i + 1, year, days[i]);
-       memset(lineout, ' ', sizeof(lineout) - 1);
-       lineout[sizeof(lineout) - 1] = '\0';
-       for (month = 0; month < 12; month += 2) {
-               center(month_names[month], J_WEEK_LEN, J_HEAD_SEP);
-               center(month_names[month + 1], J_WEEK_LEN, 0);
-               printf("\n%s%*s%s\n", j_day_headings, J_HEAD_SEP, "",
-                   j_day_headings);
-               for (row = 0; row < 6; row++) {
-                       for (which_cal = 0; which_cal < 2; which_cal++) {
-                               p = lineout + which_cal * (J_WEEK_LEN + 2);
-                               dp = &days[month + which_cal][row * 7];
-                               for (col = 0; col < 7; col++, p += J_DAY_LEN)
-                                       ascii_day(p, *dp++);
+               if (i < 7) {
+                       zero_tm.tm_wday = i;
+                       /* abbreviated weekday name according to locale */
+                       strftime(buf, sizeof(buf), "%a", &zero_tm);
+#if ENABLE_UNICODE_SUPPORT
+                       if (julian)
+                               *hp++ = ' ';
+                       {
+                               char *two_wchars = unicode_conv_to_printable_fixedwidth(/*NULL,*/ buf, 2);
+                               strcpy(hp, two_wchars);
+                               free(two_wchars);
                        }
-                       *p = '\0';
-                       trim_trailing_spaces(lineout);
-                       printf("%s\n", lineout);
+                       hp += strlen(hp);
+                       *hp++ = ' ';
+#else
+                       strncpy(day_headings + i * (3+julian) + julian, buf, 2);
+#endif
                }
-       }
-       printf("\n");
-}
-
-void yearly(int year)
-{
-       int col, *dp, i, month, row, which_cal;
-       int days[12][MAXDAYS];
-       char *p, lineout[80];
-
-       sprintf(lineout, "%d", year);
-       center(lineout, WEEK_LEN * 3 + HEAD_SEP * 2, 0);
-       printf("\n\n");
-       for (i = 0; i < 12; i++)
-               day_array(i + 1, year, days[i]);
-       memset(lineout, ' ', sizeof(lineout) - 1);
-       lineout[sizeof(lineout) - 1] = '\0';
-       for (month = 0; month < 12; month += 3) {
-               center(month_names[month], WEEK_LEN, HEAD_SEP);
-               center(month_names[month + 1], WEEK_LEN, HEAD_SEP);
-               center(month_names[month + 2], WEEK_LEN, 0);
-               printf("\n%s%*s%s%*s%s\n", day_headings, HEAD_SEP,
-                   "", day_headings, HEAD_SEP, "", day_headings);
+       } while (++i < 12);
+       IF_UNICODE_SUPPORT(hp[-1] = '\0';)
+
+       if (month) {
+               unsigned row, len, days[MAXDAYS];
+               unsigned *dp = days;
+               char lineout[30];
+
+               day_array(month, year, dp);
+               len = sprintf(lineout, "%s %u", month_names[month - 1], year);
+               printf("%*s%s\n%s\n",
+                               ((7*julian + WEEK_LEN) - len) / 2, "",
+                               lineout, day_headings);
                for (row = 0; row < 6; row++) {
-                       for (which_cal = 0; which_cal < 3; which_cal++) {
-                               p = lineout + which_cal * (WEEK_LEN + 2);
-                               dp = &days[month + which_cal][row * 7];
-                               for (col = 0; col < 7; col++, p += DAY_LEN)
-                                       ascii_day(p, *dp++);
+                       build_row(lineout, dp)[0] = '\0';
+                       dp += 7;
+                       trim_trailing_spaces_and_print(lineout);
+               }
+       } else {
+               unsigned row, which_cal, week_len, days[12][MAXDAYS];
+               unsigned *dp;
+               char lineout[80];
+
+               sprintf(lineout, "%u", year);
+               center(lineout,
+                               (WEEK_LEN * 3 + HEAD_SEP * 2)
+                               + julian * (J_WEEK_LEN * 2 + HEAD_SEP
+                                               - (WEEK_LEN * 3 + HEAD_SEP * 2)),
+                               0
+               );
+               puts("\n");             /* two \n's */
+               for (i = 0; i < 12; i++) {
+                       day_array(i + 1, year, days[i]);
+               }
+               blank_string(lineout, sizeof(lineout));
+               week_len = WEEK_LEN + julian * (J_WEEK_LEN - WEEK_LEN);
+               for (month = 0; month < 12; month += 3-julian) {
+                       center(month_names[month], week_len, HEAD_SEP);
+                       if (!julian) {
+                               center(month_names[month + 1], week_len, HEAD_SEP);
+                       }
+                       center(month_names[month + 2 - julian], week_len, 0);
+                       printf("\n%s%*s%s", day_headings, HEAD_SEP, "", day_headings);
+                       if (!julian) {
+                               printf("%*s%s", HEAD_SEP, "", day_headings);
+                       }
+                       bb_putchar('\n');
+                       for (row = 0; row < (6*7); row += 7) {
+                               for (which_cal = 0; which_cal < 3-julian; which_cal++) {
+                                       dp = days[month + which_cal] + row;
+                                       build_row(lineout + which_cal * (week_len + 2), dp);
+                               }
+                               /* blank_string took care of nul termination. */
+                               trim_trailing_spaces_and_print(lineout);
                        }
-                       *p = '\0';
-                       trim_trailing_spaces(lineout);
-                       printf("%s\n", lineout);
                }
        }
-       printf("\n");
+
+       fflush_stdout_and_exit(EXIT_SUCCESS);
 }
 
 /*
@@ -277,118 +232,131 @@ void yearly(int year)
  *     out end to end.  You would have 42 numbers or spaces.  This routine
  *     builds that array for any month from Jan. 1 through Dec. 9999.
  */
-void day_array(int month, int year, int *days)
+static void day_array(unsigned month, unsigned year, unsigned *days)
 {
-       int day, dw, dm;
+       unsigned long temp;
+       unsigned i;
+       unsigned day, dw, dm;
+
+       memset(days, SPACE, MAXDAYS * sizeof(int));
 
        if ((month == 9) && (year == 1752)) {
-               memmove(days,
-                       julian ? j_sep1752 : sep1752, MAXDAYS * sizeof(int));
+               /* Assumes the Gregorian reformation eliminates
+                * 3 Sep. 1752 through 13 Sep. 1752.
+                */
+               unsigned j_offset = julian * 244;
+               size_t oday = 0;
+
+               do {
+                       days[oday+2] = sep1752[oday] + j_offset;
+               } while (++oday < sizeof(sep1752));
+
                return;
        }
-       memmove(days, empty, MAXDAYS * sizeof(int));
-       dm = days_in_month[leap_year(year)][month];
-       dw = day_in_week(1, month, year);
-       day = julian ? day_in_year(1, month, year) : 1;
-       while (dm--)
-               days[dw++] = day++;
-}
 
-/*
- * day_in_year --
- *     return the 1 based day number within the year
- */
-int day_in_year(int day, int month, int year)
-{
-       int i, leap;
+       /* day_in_year
+        * return the 1 based day number within the year
+        */
+       day = 1;
+       if ((month > 2) && leap_year(year)) {
+               ++day;
+       }
 
-       leap = leap_year(year);
-       for (i = 1; i < month; i++)
-               day += days_in_month[leap][i];
-       return (day);
-}
+       i = month;
+       while (i) {
+               day += days_in_month[--i];
+       }
 
-/*
- * day_in_week
- *     return the 0 based day number for any date from 1 Jan. 1 to
- *     31 Dec. 9999.  Assumes the Gregorian reformation eliminates
- *     3 Sep. 1752 through 13 Sep. 1752.  Returns Thursday for all
- *     missing days.
- */
-int day_in_week(int day, int month, int year)
-{
-       long temp;
-
-       temp = (long)(year - 1) * 365 + leap_years_since_year_1(year - 1)
-           + day_in_year(day, month, year);
-       if (temp < FIRST_MISSING_DAY)
-               return ((temp - 1 + SATURDAY) % 7);
-       if (temp >= (FIRST_MISSING_DAY + NUMBER_MISSING_DAYS))
-               return (((temp - 1 + SATURDAY) - NUMBER_MISSING_DAYS) % 7);
-       return (THURSDAY);
+       /* day_in_week
+        * return the 0 based day number for any date from 1 Jan. 1 to
+        * 31 Dec. 9999.  Assumes the Gregorian reformation eliminates
+        * 3 Sep. 1752 through 13 Sep. 1752.  Returns Thursday for all
+        * missing days.
+        */
+       temp = (long)(year - 1) * 365 + leap_years_since_year_1(year - 1) + day;
+       if (temp < FIRST_MISSING_DAY) {
+               dw = ((temp - 1 + SATURDAY) % 7);
+       } else {
+               dw = (((temp - 1 + SATURDAY) - NUMBER_MISSING_DAYS) % 7);
+       }
+
+       if (!julian) {
+               day = 1;
+       }
+
+       dm = days_in_month[month];
+       if ((month == 2) && leap_year(year)) {
+               ++dm;
+       }
+
+       do {
+               days[dw++] = day++;
+       } while (--dm);
 }
 
-void ascii_day(char *p, int day)
+static void trim_trailing_spaces_and_print(char *s)
 {
-       int display, val;
-       static char *aday[] = {
-               "",
-               " 1", " 2", " 3", " 4", " 5", " 6", " 7",
-               " 8", " 9", "10", "11", "12", "13", "14",
-               "15", "16", "17", "18", "19", "20", "21",
-               "22", "23", "24", "25", "26", "27", "28",
-               "29", "30", "31",
-       };
-
-       if (day == SPACE) {
-               memset(p, ' ', julian ? J_DAY_LEN : DAY_LEN);
-               return;
+       char *p = s;
+
+       while (*p) {
+               ++p;
        }
-       if (julian) {
-               if ((val = day / 100) != 0) {
-                       day %= 100;
-                       *p++ = val + '0';
-                       display = 1;
-               } else {
-                       *p++ = ' ';
-                       display = 0;
+       while (p != s) {
+               --p;
+               if (!isspace(*p)) {
+                       p[1] = '\0';
+                       break;
                }
-               val = day / 10;
-               if (val || display)
-                       *p++ = val + '0';
-               else
-                       *p++ = ' ';
-               *p++ = day % 10 + '0';
-       } else {
-               *p++ = aday[day][0];
-               *p++ = aday[day][1];
        }
-       *p = ' ';
+
+       puts(s);
 }
 
-void trim_trailing_spaces(char *s)
+static void center(char *str, unsigned len, unsigned separate)
 {
-       char *p;
+       unsigned n = strlen(str);
+       len -= n;
+       printf("%*s%*s", (len/2) + n, str, (len/2) + (len % 2) + separate, "");
+}
 
-       for (p = s; *p; ++p)
-               continue;
-       while (p > s && (--p, isspace(*p)))
-               continue;
-       if (p > s)
-               ++p;
-       *p = '\0';
+static void blank_string(char *buf, size_t buflen)
+{
+       memset(buf, ' ', buflen);
+       buf[buflen-1] = '\0';
 }
 
-void center(char *str, int len, int separate)
+static char *build_row(char *p, unsigned *dp)
 {
+       unsigned col, val, day;
+
+       memset(p, ' ', (julian + DAY_LEN) * 7);
+
+       col = 0;
+       do {
+               day = *dp++;
+               if (day != SPACE) {
+                       if (julian) {
+                               ++p;
+                               if (day >= 100) {
+                                       *p = '0';
+                                       p[-1] = (day / 100) + '0';
+                                       day %= 100;
+                               }
+                       }
+                       val = day / 10;
+                       if (val > 0) {
+                               *p = val + '0';
+                       }
+                       *++p = day % 10 + '0';
+                       p += 2;
+               } else {
+                       p += DAY_LEN + julian;
+               }
+       } while (++col < 7);
 
-       len -= strlen(str);
-       printf("%*s%s%*s", len / 2, "", str, len / 2 + len % 2, "");
-       if (separate)
-               printf("%*s", separate, "");
+       return p;
 }
 
-
 /*
  * Copyright (c) 1989, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
@@ -420,5 +388,3 @@ void center(char *str, int len, int separate)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
-