Changeset 225

Show
Ignore:
Timestamp:
07/16/06 20:01:31 (6 years ago)
Author:
tg
Message:

sync with upstream after feeding the patches back

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/tools/paxmirabilis/src/Makefile

    r204 r225  
    1 # $MirOS: src/bin/pax/Makefile,v 1.2 2005/04/13 20:11:23 tg Exp $ 
     1# $MirOS: src/bin/pax/Makefile,v 1.3 2006/07/16 17:55:17 tg Exp $ 
    22# $OpenBSD: Makefile,v 1.10 2001/05/26 00:32:20 millert Exp $ 
    33 
    …… 
    2020LINKS=  ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio 
    2121 
    22 .if ${OStype} == "Interix" 
     22.if (${OStype} == "Interix") || (${OStype} == "Linux") 
    2323CPPFLAGS+= -DLONG_OFF_T 
    2424.endif 

  • trunk/freewrt/tools/paxmirabilis/src/cache.c

    r221 r225  
    1 /**     $MirOS: src/bin/pax/cache.c,v 1.2 2005/04/13 20:03:35 tg Exp $ */ 
     1/**     $MirOS: src/bin/pax/cache.c,v 1.3 2006/07/16 17:55:18 tg Exp $ */ 
    22/*      $OpenBSD: cache.c,v 1.17 2004/03/16 03:28:34 tedu Exp $ */ 
    33/*      $NetBSD: cache.c,v 1.4 1995/03/21 09:07:10 cgd Exp $    */ 
    …… 
    5151 
    5252__SCCSID("@(#)cache.c   8.1 (Berkeley) 5/31/93"); 
    53 __RCSID("$MirOS: src/bin/pax/cache.c,v 1.2 2005/04/13 20:03:35 tg Exp $"); 
     53__RCSID("$MirOS: src/bin/pax/cache.c,v 1.3 2006/07/16 17:55:18 tg Exp $"); 
    5454 
    5555/* 

  • trunk/freewrt/tools/paxmirabilis/src/extern.h

    r216 r225  
    1 /**     $MirOS: src/bin/pax/extern.h,v 1.6 2006/06/19 19:22:08 tg Exp $ */ 
     1/**     $MirOS: src/bin/pax/extern.h,v 1.7 2006/07/16 17:56:29 tg Exp $ */ 
    22/*      $OpenBSD: extern.h,v 1.31 2005/04/28 06:58:07 otto Exp $        */ 
    33/*      $NetBSD: extern.h,v 1.5 1996/03/26 23:54:16 mrg Exp $   */ 
    …… 
    4343 
    4444#include <sys/cdefs.h> 
    45 #ifndef BSD 
     45#if defined(__GLIBC__) 
    4646#include <time.h> 
    4747#endif 

  • trunk/freewrt/tools/paxmirabilis/src/gen_subs.c

    r217 r225  
    1 /**     $MirOS: src/bin/pax/gen_subs.c,v 1.5 2005/04/29 18:34:44 tg Exp $ */ 
     1/**     $MirOS: src/bin/pax/gen_subs.c,v 1.6 2006/07/16 17:58:08 tg Exp $ */ 
    22/*      $OpenBSD: gen_subs.c,v 1.18 2005/04/28 06:58:07 otto Exp $      */ 
    33/*      $NetBSD: gen_subs.c,v 1.5 1995/03/21 09:07:26 cgd Exp $ */ 
    …… 
    5050#include <stdlib.h> 
    5151#include <string.h> 
    52 #ifdef BSD 
     52#ifndef __GLIBC__ 
    5353#include <vis.h> 
    5454#endif 
    …… 
    5757 
    5858__SCCSID("@(#)gen_subs.c        8.1 (Berkeley) 5/31/93"); 
    59 __RCSID("$MirOS: src/bin/pax/gen_subs.c,v 1.5 2005/04/29 18:34:44 tg Exp $"); 
    60  
    61 void strmode(mode_t mode, char *p); 
     59__RCSID("$MirOS: src/bin/pax/gen_subs.c,v 1.6 2006/07/16 17:58:08 tg Exp $"); 
     60 
     61#ifdef __GLIBC__ 
     62void strmode(mode_t, char *); 
     63#endif 
    6264 
    6365/* 
    …… 
    201203safe_print(const char *str, FILE *fp) 
    202204{ 
    203 #ifdef BSD 
     205#ifndef __GLIBC__ 
    204206        char visbuf[5]; 
    205207        const char *cp; 

  • trunk/freewrt/tools/paxmirabilis/src/options.c

    r221 r225  
    1 /**     $MirOS: src/bin/pax/options.c,v 1.18 2006/07/16 16:14:50 tg Exp $ */ 
     1/**     $MirOS: src/bin/pax/options.c,v 1.19 2006/07/16 17:58:39 tg Exp $ */ 
    22/*      $OpenBSD: options.c,v 1.64 2006/04/09 03:35:34 jaredy Exp $     */ 
    33/*      $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $  */ 
    …… 
    5858 
    5959__SCCSID("@(#)options.c 8.2 (Berkeley) 4/18/94"); 
    60 __RCSID("$MirOS: src/bin/pax/options.c,v 1.18 2006/07/16 16:14:50 tg Exp $"); 
     60__RCSID("$MirOS: src/bin/pax/options.c,v 1.19 2006/07/16 17:58:39 tg Exp $"); 
    6161 
    6262#ifdef __GLIBC__ 
    …… 
    15061506        if ((num == LONG_MAX) || (num <= 0) || (expr == val)) 
    15071507#       else 
    1508         num = strtoll(val, &expr, 0); 
    1509         if ((num == LLONG_MAX) || (num <= 0) || (expr == val)) 
     1508        num = strtoq(val, &expr, 0); 
     1509        if ((num == QUAD_MAX) || (num <= 0) || (expr == val)) 
    15101510#       endif 
    15111511                return(0); 

  • trunk/freewrt/tools/paxmirabilis/src/pax.c

    r218 r225  
    1 /**     $MirOS: src/bin/pax/pax.c,v 1.4 2006/06/23 23:03:57 tg Exp $ */ 
     1/**     $MirOS: src/bin/pax/pax.c,v 1.5 2006/07/16 18:00:33 tg Exp $ */ 
    22/*      $OpenBSD: pax.c,v 1.28 2005/08/04 10:02:44 mpf Exp $    */ 
    33/*      $NetBSD: pax.c,v 1.5 1996/03/26 23:54:20 mrg Exp $      */ 
    …… 
    5959 
    6060__SCCSID("@(#)pax.c     8.2 (Berkeley) 4/18/94"); 
    61 __RCSID("$MirOS: src/bin/pax/pax.c,v 1.4 2006/06/23 23:03:57 tg Exp $"); 
     61__RCSID("$MirOS: src/bin/pax/pax.c,v 1.5 2006/07/16 18:00:33 tg Exp $"); 
    6262 
    6363static int gen_init(void); 
    …… 
    102102char    *argv0;                 /* root of argv[0] */ 
    103103sigset_t s_mask;                /* signal mask for cleanup critical sect */ 
    104 FILE    *listf;                 /* file pointer to print file list to */ 
     104FILE    *listf;                 /* fp to print file list to (default stderr) */ 
    105105char    *tempfile;              /* tempfile to use for mkstemp(3) */ 
    106106char    *tempbase;              /* basename of tempfile to use for mkstemp(3) */ 
    …… 
    232232        size_t tdlen; 
    233233 
    234         listf = stderr; 
    235  
    236234        /* 
    237235         * Keep a reference to cwd, so we can always come back home. 
    …… 
    260258        tempbase = tempfile + tdlen; 
    261259        *tempbase++ = '/'; 
     260 
     261        listf = stderr; 
    262262 
    263263        /*