sel_subs.h is only used by sel_subs.c; merge it into the .c file

<sys/time.h> and <unistd.h> are unnecessary, but <time.h> is; sort #includes

diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index fc9194d..17200b5 100644 (file)
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sel_subs.c,v 1.25 2014/11/23 05:47:49 guenther Exp $  */
+/*     $OpenBSD: sel_subs.c,v 1.26 2016/08/26 04:20:38 guenther Exp $  */
 /*     $NetBSD: sel_subs.c,v 1.5 1995/03/21 09:07:42 cgd Exp $ */
 
 /*-
@@ -35,7 +35,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <grp.h>
@@ -43,11 +42,46 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <time.h>
+
 #include "pax.h"
-#include "sel_subs.h"
 #include "extern.h"
 
+/*
+ * data structure for storing uid/grp selects (-U, -G non standard options)
+ */
+
+#define USR_TB_SZ      317             /* user selection table size */
+#define GRP_TB_SZ      317             /* user selection table size */
+
+typedef struct usrt {
+       uid_t uid;
+       struct usrt *fow;               /* next uid */
+} USRT;
+
+typedef struct grpt {
+       gid_t gid;
+       struct grpt *fow;               /* next gid */
+} GRPT;
+
+/*
+ * data structure for storing user supplied time ranges (-T option)
+ */
+
+#define ATOI2(ar)      ((ar)[0] - '0') * 10 + ((ar)[1] - '0'); (ar) += 2;
+
+typedef struct time_rng {
+       time_t          low_time;       /* lower inclusive time limit */
+       time_t          high_time;      /* higher inclusive time limit */
+       int             flgs;           /* option flags */
+#define        HASLOW          0x01            /* has lower time limit */
+#define HASHIGH                0x02            /* has higher time limit */
+#define CMPMTME                0x04            /* compare file modification time */
+#define CMPCTME                0x08            /* compare inode change time */
+#define CMPBOTH        (CMPMTME|CMPCTME)       /* compare inode and mod time */
+       struct time_rng *fow;           /* next pattern */
+} TIME_RNG;
+
 static int str_sec(const char *, time_t *);
 static int usr_match(ARCHD *);
 static int grp_match(ARCHD *);

diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h
deleted file mode 100644 (file)
index b699ee8..0000000
--- a/bin/pax/sel_subs.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*     $OpenBSD: sel_subs.h,v 1.4 2003/06/02 23:32:09 millert Exp $    */
-/*     $NetBSD: sel_subs.h,v 1.3 1995/03/21 09:07:44 cgd Exp $ */
-
-/*-
- * Copyright (c) 1992 Keith Muller.
- * Copyright (c) 1992, 1993
- *     The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Keith Muller of the University of California, San Diego.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *     @(#)sel_subs.h  8.1 (Berkeley) 5/31/93
- */
-
-/*
- * data structure for storing uid/grp selects (-U, -G non standard options)
- */
-
-#define USR_TB_SZ      317             /* user selection table size */
-#define GRP_TB_SZ      317             /* user selection table size */
-
-typedef struct usrt {
-       uid_t uid;
-       struct usrt *fow;               /* next uid */
-} USRT;
-
-typedef struct grpt {
-       gid_t gid;
-       struct grpt *fow;               /* next gid */
-} GRPT;
-
-/*
- * data structure for storing user supplied time ranges (-T option)
- */
-
-#define ATOI2(ar)      ((ar)[0] - '0') * 10 + ((ar)[1] - '0'); (ar) += 2;
-
-typedef struct time_rng {
-       time_t          low_time;       /* lower inclusive time limit */
-       time_t          high_time;      /* higher inclusive time limit */
-       int             flgs;           /* option flags */
-#define        HASLOW          0x01            /* has lower time limit */
-#define HASHIGH                0x02            /* has higher time limit */
-#define CMPMTME                0x04            /* compare file modification time */
-#define CMPCTME                0x08            /* compare inode change time */
-#define CMPBOTH        (CMPMTME|CMPCTME)       /* compare inode and mod time */
-       struct time_rng *fow;           /* next pattern */
-} TIME_RNG;