Zap leading whitespace

diff --git a/bin/pax/options.c b/bin/pax/options.c
index 840fafb..994ce5d 100644 (file)
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: options.c,v 1.79 2014/01/08 05:52:47 guenther Exp $   */
+/*     $OpenBSD: options.c,v 1.80 2014/01/08 06:43:34 deraadt Exp $    */
 /*     $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $  */
 
 /*-
@@ -85,7 +85,7 @@ static int getline_error;
  *     Format specific routine table - MUST BE IN SORTED ORDER BY NAME
  *     (see pax.h for description of each function)
  *
- *     name, blksz, hdsz, udev, hlk, blkagn, inhead, id, st_read,
+ *     name, blksz, hdsz, udev, hlk, blkagn, inhead, id, st_read,
  *     read, end_read, st_write, write, end_write, trail,
  *     rd_data, wr_data, options
  */
@@ -1439,7 +1439,7 @@ opt_add(const char *str)
 /*
  * str_offt()
  *     Convert an expression of the following forms to an off_t > 0.
- *     1) A positive decimal number.
+ *     1) A positive decimal number.
  *     2) A positive decimal number followed by a b (mult by 512).
  *     3) A positive decimal number followed by a k (mult by 1024).
  *     4) A positive decimal number followed by a m (mult by 512).

diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 27e0f61..b470a43 100644 (file)
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sel_subs.c,v 1.22 2013/11/21 15:54:45 deraadt Exp $   */
+/*     $OpenBSD: sel_subs.c,v 1.23 2014/01/08 06:43:34 deraadt Exp $   */
 /*     $NetBSD: sel_subs.c,v 1.5 1995/03/21 09:07:42 cgd Exp $ */
 
 /*-
@@ -109,7 +109,7 @@ usr_add(char *str)
        if ((str == NULL) || (*str == '\0'))
                return(-1);
        if ((usrtb == NULL) &&
-           ((usrtb = (USRT **)calloc(USR_TB_SZ, sizeof(USRT *))) == NULL)) {
+           ((usrtb = (USRT **)calloc(USR_TB_SZ, sizeof(USRT *))) == NULL)) {
                paxwarn(1, "Unable to allocate memory for user selection table");
                return(-1);
        }
@@ -206,7 +206,7 @@ grp_add(char *str)
        if ((str == NULL) || (*str == '\0'))
                return(-1);
        if ((grptb == NULL) &&
-           ((grptb = (GRPT **)calloc(GRP_TB_SZ, sizeof(GRPT *))) == NULL)) {
+           ((grptb = (GRPT **)calloc(GRP_TB_SZ, sizeof(GRPT *))) == NULL)) {
                paxwarn(1, "Unable to allocate memory fo group selection table");
                return(-1);
        }

diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index ebad8b8..017abc5 100644 (file)
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tables.c,v 1.29 2014/01/08 06:41:49 guenther Exp $    */
+/*     $OpenBSD: tables.c,v 1.30 2014/01/08 06:43:34 deraadt Exp $     */
 /*     $NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $   */
 
 /*-
@@ -103,7 +103,7 @@ lnk_start(void)
 {
        if (ltab != NULL)
                return(0);
-       if ((ltab = (HRDLNK **)calloc(L_TAB_SZ, sizeof(HRDLNK *))) == NULL) {
+       if ((ltab = (HRDLNK **)calloc(L_TAB_SZ, sizeof(HRDLNK *))) == NULL) {
                paxwarn(1, "Cannot allocate memory for hard link table");
                return(-1);
        }
@@ -331,7 +331,7 @@ ftime_start(void)
 
        if (ftab != NULL)
                return(0);
-       if ((ftab = (FTM **)calloc(F_TAB_SZ, sizeof(FTM *))) == NULL) {
+       if ((ftab = (FTM **)calloc(F_TAB_SZ, sizeof(FTM *))) == NULL) {
                paxwarn(1, "Cannot allocate memory for file time table");
                return(-1);
        }
@@ -487,7 +487,7 @@ name_start(void)
 {
        if (ntab != NULL)
                return(0);
-       if ((ntab = (NAMT **)calloc(N_TAB_SZ, sizeof(NAMT *))) == NULL) {
+       if ((ntab = (NAMT **)calloc(N_TAB_SZ, sizeof(NAMT *))) == NULL) {
                paxwarn(1, "Cannot allocate memory for interactive rename table");
                return(-1);
        }
@@ -661,7 +661,7 @@ dev_start(void)
 {
        if (dtab != NULL)
                return(0);
-       if ((dtab = (DEVT **)calloc(D_TAB_SZ, sizeof(DEVT *))) == NULL) {
+       if ((dtab = (DEVT **)calloc(D_TAB_SZ, sizeof(DEVT *))) == NULL) {
                paxwarn(1, "Cannot allocate memory for device mapping table");
                return(-1);
        }
@@ -904,7 +904,7 @@ atdir_start(void)
 {
        if (atab != NULL)
                return(0);
-       if ((atab = (ATDIR **)calloc(A_TAB_SZ, sizeof(ATDIR *))) == NULL) {
+       if ((atab = (ATDIR **)calloc(A_TAB_SZ, sizeof(ATDIR *))) == NULL) {
                paxwarn(1,"Cannot allocate space for directory access time table");
                return(-1);
        }

diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index 1c0965c..318d099 100644 (file)
--- a/bin/pax/tar.h
+++ b/bin/pax/tar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tar.h,v 1.8 2013/04/09 18:30:34 fgsch Exp $   */
+/*     $OpenBSD: tar.h,v 1.9 2014/01/08 06:43:34 deraadt Exp $ */
 /*     $NetBSD: tar.h,v 1.3 1995/03/21 09:07:51 cgd Exp $      */
 
 /*-
@@ -102,8 +102,8 @@
  */
 typedef struct {
        char name[TNMSZ];               /* name of entry */
-       char mode[8];                   /* mode */
-       char uid[8];                    /* uid */
+       char mode[8];                   /* mode */
+       char uid[8];                    /* uid */
        char gid[8];                    /* gid */
        char size[12];                  /* size */
        char mtime[12];                 /* modification time */
@@ -141,8 +141,8 @@ typedef struct {
 
 typedef struct {
        char name[TNMSZ];               /* name of entry */
-       char mode[8];                   /* mode */
-       char uid[8];                    /* uid */
+       char mode[8];                   /* mode */
+       char uid[8];                    /* uid */
        char gid[8];                    /* gid */
        char size[12];                  /* size */
        char mtime[12];                 /* modification time */