file_cmds-272.tar.gz

[apple/file_cmds.git] / pax / pat_rep.c

diff --git a/pax/pat_rep.c b/pax/pat_rep.c
index 5f4686465150dd5b3e0742bcabd093d18a02178e..ff2819e28218165b6b4bbbfe0688584701732358 100644 (file)
--- a/pax/pat_rep.c
+++ b/pax/pat_rep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pat_rep.c,v 1.28 2004/06/11 03:10:43 millert Exp $    */
+/*     $OpenBSD: pat_rep.c,v 1.30 2005/08/05 08:30:10 djm Exp $        */

 /*     $NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $  */
 
 /*-
 /*     $NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $  */
 
 /*-


@@ -34,11 +34,12 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #if 0
 static const char sccsid[] = "@(#)pat_rep.c    8.2 (Berkeley) 4/18/94";
 #else
 #ifndef lint
 #if 0
 static const char sccsid[] = "@(#)pat_rep.c    8.2 (Berkeley) 4/18/94";
 #else

-static const char rcsid[] __attribute__((__unused__)) = "$OpenBSD: pat_rep.c,v 1.28 2004/06/11 03:10:43 millert Exp $";
+__used static const char rcsid[] = "$OpenBSD: pat_rep.c,v 1.30 2005/08/05 08:30:10 djm Exp $";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -468,7 +469,7 @@ pat_match(ARCHD *arcn)
        /*
         * we had a match, now when we invert the sense (-c) we reject this
         * member. However we have to tag the pattern a being successful, (in a
        /*
         * we had a match, now when we invert the sense (-c) we reject this
         * member. However we have to tag the pattern a being successful, (in a

-        * match, not in selecting a archive member) so we call pat_sel() here.
+        * match, not in selecting an archive member) so we call pat_sel() here.

         */
        arcn->pat = pt;
        if (!cflag)
         */
        arcn->pat = pt;
        if (!cflag)


@@ -518,7 +519,7 @@ fn_match(char *pattern, char *string, char **pend)
                        *pend = string;
                        return(0);
                case '?':
                        *pend = string;
                        return(0);
                case '?':

-                       if ((test = *string++) == '\0')
+                       if ((*string++) == '\0')

                                return (-1);
                        break;
                case '*':
                                return (-1);
                        break;
                case '*':


@@ -538,7 +539,7 @@ fn_match(char *pattern, char *string, char **pend)
                        /*
                         * General case, use recursion.
                         */
                        /*
                         * General case, use recursion.
                         */

-                       while ((test = *string) != '\0') {
+                       while ((*string) != '\0') {

                                if (!fn_match(pattern, string, pend))
                                        return (0);
                                ++string;
                                if (!fn_match(pattern, string, pend))
                                        return (0);
                                ++string;


@@ -614,7 +615,7 @@ mod_name(ARCHD *arcn)
         * Strip off leading '/' if appropriate.
         * Currently, this option is only set for the tar format.
         */
         * Strip off leading '/' if appropriate.
         * Currently, this option is only set for the tar format.
         */

-       if (rmleadslash && arcn->name[0] == '/') {
+       while (rmleadslash && arcn->name[0] == '/') {

                if (arcn->name[1] == '\0') {
                        arcn->name[0] = '.';
                } else {
                if (arcn->name[1] == '\0') {
                        arcn->name[0] = '.';
                } else {


@@ -627,7 +628,7 @@ mod_name(ARCHD *arcn)
                        paxwarn(0, "Removing leading / from absolute path names in the archive");
                }
        }
                        paxwarn(0, "Removing leading / from absolute path names in the archive");
                }
        }

-       if (rmleadslash && arcn->ln_name[0] == '/' &&
+       while (rmleadslash && arcn->ln_name[0] == '/' &&

            (arcn->type == PAX_HLK || arcn->type == PAX_HRG)) {
                if (arcn->ln_name[1] == '\0') {
                        arcn->ln_name[0] = '.';
            (arcn->type == PAX_HLK || arcn->type == PAX_HRG)) {
                if (arcn->ln_name[1] == '\0') {
                        arcn->ln_name[0] = '.';


@@ -750,6 +751,8 @@ tty_rename(ARCHD *arcn)
        tty_prnt("Processing continues, name changed to: %s\n", tmpname);
        res = add_name(arcn->name, arcn->nlen, tmpname);
        arcn->nlen = strlcpy(arcn->name, tmpname, sizeof(arcn->name));
        tty_prnt("Processing continues, name changed to: %s\n", tmpname);
        res = add_name(arcn->name, arcn->nlen, tmpname);
        arcn->nlen = strlcpy(arcn->name, tmpname, sizeof(arcn->name));

+       if (arcn->nlen >= sizeof(arcn->name))
+               arcn->nlen = sizeof(arcn->name) - 1; /* XXX truncate? */

        if (res < 0)
                return(-1);
        return(0);
        if (res < 0)
                return(-1);
        return(0);


@@ -1043,7 +1046,7 @@ resub(regex_t *rp, regmatch_t *pm, char *src, char *inpt, char *dest,
                 * continue if the subexpression is bogus
                 */
                if ((pmpt->rm_so < 0) || (pmpt->rm_eo < 0) ||
                 * continue if the subexpression is bogus
                 */
                if ((pmpt->rm_so < 0) || (pmpt->rm_eo < 0) ||

-                   ((len = pmpt->rm_eo - pmpt->rm_so) <= 0))
+                   ((len = (int)(pmpt->rm_eo - pmpt->rm_so)) <= 0))

                        continue;
 
                /*
                        continue;
 
                /*


@@ -1051,7 +1054,7 @@ resub(regex_t *rp, regmatch_t *pm, char *src, char *inpt, char *dest,
                 * fail if we run out of space or the match string is damaged
                 */
                if (len > (destend - dpt))
                 * fail if we run out of space or the match string is damaged
                 */
                if (len > (destend - dpt))

-                       return (-1);
+                       len = destend - dpt;

                strncpy(dpt, inpt + pmpt->rm_so, len);
                dpt += len;
        }
                strncpy(dpt, inpt + pmpt->rm_so, len);
                dpt += len;
        }