Ignore:
Timestamp:
Feb 25, 2011, 9:26:54 PM (13 years ago)
Author:
Bruno Cornec
Message:
  • Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3
Location:
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid
Files:
1 added
13 edited

Legend:

Unmodified
Added
Removed

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/Kbuild

    r1765 r2725  
     1# DO NOT EDIT. This file is generated from Kbuild.src
    12# Makefile for busybox
    23#
    34# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
    45#
    5 # Licensed under the GPL v2, see the file LICENSE in this tarball.
     6# Licensed under GPLv2, see file LICENSE in this source tree.
    67
    78NEEDED-$(CONFIG_E2FSCK) = y
    … …  
    1112
    1213lib-y:=
     14
     15
     16
    1317lib-$(NEEDED-y) += cache.o dev.o devname.o devno.o blkid_getsize.o \
    1418                   probe.o read.o resolve.o save.o tag.o list.o

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/blkid.h

    r1765 r2725  
    1111 * %End-Header%
    1212 */
    13 
    14 #ifndef _BLKID_BLKID_H
    15 #define _BLKID_BLKID_H
     13#ifndef BLKID_BLKID_H
     14#define BLKID_BLKID_H 1
    1615
    1716#include <sys/types.h>
    … …  
    103102#endif
    104103
    105 #endif /* _BLKID_BLKID_H */
     104#endif

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/blkidP.h

    r1765 r2725  
    1111 * %End-Header%
    1212 */
    13 
    14 #ifndef _BLKID_BLKIDP_H
    15 #define _BLKID_BLKIDP_H
     13#ifndef BLKID_BLKIDP_H
     14#define BLKID_BLKIDP_H 1
    1615
    1716#include <sys/types.h>
    … …  
    185184#endif
    186185
    187 #endif /* _BLKID_BLKIDP_H */
     186#endif

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/cache.c

    r1765 r2725  
    3636                filename ? filename : "default cache"));
    3737
    38     if (!(cache = (blkid_cache) calloc(1, sizeof(struct blkid_struct_cache))))
    39         return -BLKID_ERR_MEM;
     38    cache = xzalloc(sizeof(struct blkid_struct_cache));
    4039
    4140    INIT_LIST_HEAD(&cache->bic_devs);

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/dev.c

    r1765 r2725  
    2121    blkid_dev dev;
    2222
    23     if (!(dev = (blkid_dev) calloc(1, sizeof(struct blkid_struct_dev))))
    24         return NULL;
     23    dev = xzalloc(sizeof(struct blkid_struct_dev));
    2524
    2625    INIT_LIST_HEAD(&dev->bid_devs);
    … …  
    8382            printf("    tag: NULL\n");
    8483    }
    85     puts("");
     84    bb_putchar('\n');
    8685}
    8786#endif
    … …  
    162161{
    163162    blkid_dev_iterate   iter;
    164     blkid_cache         cache = NULL;
     163    blkid_cache     cache = NULL;
    165164    blkid_dev       dev;
    166165    int         c, ret;

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/devname.c

    r1765 r2725  
    153153
    154154    DBG(DEBUG_DEVNAME, printf("opening %s\n", lvm_device));
    155     if ((lvf = fopen(lvm_device, "r")) == NULL) {
     155    if ((lvf = fopen_for_read(lvm_device)) == NULL) {
    156156        DBG(DEBUG_DEVNAME, printf("%s: (%d) %s\n", lvm_device, errno,
    157157                      strerror(errno)));
    … …  
    234234    char device[110];
    235235
    236     procpt = fopen(PROC_EVMS_VOLUMES, "r");
     236    procpt = fopen_for_read(PROC_EVMS_VOLUMES);
    237237    if (!procpt)
    238238        return 0;
    239239    while (fgets(line, sizeof(line), procpt)) {
    240         if (sscanf (line, " %d %d %d %*s %*s %[^\n ]",
     240        if (sscanf(line, " %d %d %d %*s %*s %[^\n ]",
    241241                &ma, &mi, &sz, device) != 4)
    242242            continue;
    … …  
    259259    FILE *proc;
    260260    char line[1024];
    261     char ptname0[128], ptname1[128], *ptname = 0;
     261    char ptname0[128], ptname1[128], *ptname = NULL;
    262262    char *ptnames[2];
    263263    dev_t devs[2];
    … …  
    274274
    275275    if (cache->bic_flags & BLKID_BIC_FL_PROBED &&
    276         time(0) - cache->bic_time < BLKID_PROBE_INTERVAL)
     276        time(NULL) - cache->bic_time < BLKID_PROBE_INTERVAL)
    277277        return 0;
    278278
    … …  
    283283#endif
    284284
    285     proc = fopen(PROC_PARTITIONS, "r");
     285    proc = fopen_for_read(PROC_PARTITIONS);
    286286    if (!proc)
    287287        return -BLKID_ERR_PROC;
    … …  
    336336    fclose(proc);
    337337
    338     cache->bic_time = time(0);
     338    cache->bic_time = time(NULL);
    339339    cache->bic_flags |= BLKID_BIC_FL_PROBED;
    340340    blkid_flush_cache(cache);

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/list.h

    r1765 r2725  
    11/* vi: set sw=4 ts=4: */
    22#if !defined(_BLKID_LIST_H) && !defined(LIST_HEAD)
    3 #define _BLKID_LIST_H
     3#define BLKID_LIST_H 1
    44
    55#ifdef __cplusplus
    … …  
    7171#endif
    7272
    73 #endif /* _BLKID_LIST_H */
     73#endif

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/probe.c

    r1765 r2725  
    8383{
    8484    struct ext2_super_block *es = (struct ext2_super_block *) buf;
    85     const char *label = 0;
     85    const char *label = NULL;
    8686
    8787    DBG(DEBUG_PROBE, printf("ext2_sb.compat = %08X:%08X:%08X\n",
    … …  
    169169    struct vfat_super_block *vs;
    170170    char serno[10];
    171     const char *label = 0;
     171    const char *label = NULL;
    172172    int label_len = 0;
    173173
    … …  
    202202    struct msdos_super_block *ms = (struct msdos_super_block *) buf;
    203203    char serno[10];
    204     const char *label = 0;
     204    const char *label = NULL;
    205205    int label_len = 0;
    206206
    … …  
    233233{
    234234    struct xfs_super_block *xs;
    235     const char *label = 0;
     235    const char *label = NULL;
    236236
    237237    xs = (struct xfs_super_block *)buf;
    … …  
    251251    struct reiserfs_super_block *rs = (struct reiserfs_super_block *) buf;
    252252    unsigned int blocksize;
    253     const char *label = 0;
     253    const char *label = NULL;
    254254
    255255    blocksize = blkid_le16(rs->rs_blocksize);
    … …  
    278278{
    279279    struct jfs_super_block *js;
    280     const char *label = 0;
     280    const char *label = NULL;
    281281
    282282    js = (struct jfs_super_block *)buf;
    … …  
    296296{
    297297    struct romfs_super_block *ros;
    298     const char *label = 0;
     298    const char *label = NULL;
    299299
    300300    ros = (struct romfs_super_block *)buf;
    … …  
    313313{
    314314    struct cramfs_super_block *csb;
    315     const char *label = 0;
     315    const char *label = NULL;
    316316
    317317    csb = (struct cramfs_super_block *)buf;
    … …  
    430430    major = ocfsmajor(ovh);
    431431    if (major == 1)
    432         blkid_set_tag(dev,"SEC_TYPE","ocfs1",sizeof("ocfs1"));
     432        blkid_set_tag(dev, "SEC_TYPE", "ocfs1", sizeof("ocfs1"));
    433433    else if (major >= 9)
    434         blkid_set_tag(dev,"SEC_TYPE","ntocfs",sizeof("ntocfs"));
     434        blkid_set_tag(dev, "SEC_TYPE", "ntocfs", sizeof("ntocfs"));
    435435
    436436    blkid_set_tag(dev, "LABEL", (const char*)ovl.label, ocfslabellen(ovl));
    … …  
    563563        return NULL;
    564564
    565     now = time(0);
     565    now = time(NULL);
    566566    diff = now - dev->bid_time;
    567567
    … …  
    660660    if (dev && type) {
    661661        dev->bid_devno = st.st_rdev;
    662         dev->bid_time = time(0);
     662        dev->bid_time = time(NULL);
    663663        dev->bid_flags |= BLKID_BID_FL_VERIFIED;
    664664        cache->bic_flags |= BLKID_BIC_FL_CHANGED;

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/probe.h

    r1765 r2725  
    1212 * %End-Header%
    1313 */
    14 
    15 #ifndef _BLKID_PROBE_H
    16 #define _BLKID_PROBE_H
     14#ifndef BLKID_PROBE_H
     15#define BLKID_PROBE_H 1
    1716
    1817#include <linux/types.h>
    … …  
    309308    __asm__("bswap %0" : "=r" (val) : "0" (val));
    310309#else
    311     __asm__("xchgb %b0,%h0\n\t" /* swap lower bytes */
    312         "rorl $16,%0\n\t"   /* swap words       */
    313         "xchgb %b0,%h0"     /* swap higher bytes    */
     310    __asm__("xchgb %b0,%h0\n\t" /* swap lower bytes  */
     311        "rorl $16,%0\n\t"   /* swap words        */
     312        "xchgb %b0,%h0"     /* swap higher bytes */
    314313        :"=q" (val)
    315314        : "0" (val));
    … …  
    320319_INLINE_ __u16 blkid_swab16(__u16 val)
    321320{
    322     __asm__("xchgb %b0,%h0"     /* swap bytes       */ \
    323         : "=q" (val) \
    324         :  "0" (val)); \
     321    __asm__("xchgb %b0,%h0"     /* swap bytes */
     322        : "=q" (val)
     323        :  "0" (val));
    325324        return val;
    326325}

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/read.c

    r1765 r2725  
    375375                cache->bic_filename));
    376376
    377     file = fdopen(fd, "r");
    378     if (!file)
    379         goto errout;
     377    file = xfdopen_for_read(fd);
    380378
    381379    while (fgets(buf, sizeof(buf), file)) {
    … …  
    437435            printf("    tag: NULL\n");
    438436    }
    439     puts("");
     437    bb_putchar('\n');
    440438}
    441439

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/resolve.c

    r1765 r2725  
    6666    blkid_dev dev;
    6767    blkid_cache c = cache;
    68     char *t = 0, *v = 0;
     68    char *t = NULL, *v = NULL;
    6969    char *ret = NULL;
    7070
    … …  
    122122    }
    123123    if (blkid_get_cache(&cache, bb_dev_null) < 0) {
    124         fprintf(stderr, "cannot get blkid cache\n");
     124        fprintf(stderr, "Can't get blkid cache\n");
    125125        exit(1);
    126126    }

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/save.c

    r1765 r2725  
    9696        fd = mkstemp(tmp);
    9797        if (fd >= 0) {
    98             file = fdopen(fd, "w");
     98            file = xfdopen_for_write(fd);
    9999            opened = tmp;
    100100        }
    … …  
    103103
    104104    if (!file) {
    105         file = fopen(filename, "w");
     105        file = fopen_for_write(filename);
    106106        opened = filename;
    107107    }

  • branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/tag.c

    r1765 r2725  
    2222    blkid_tag tag;
    2323
    24     if (!(tag = (blkid_tag) calloc(1, sizeof(struct blkid_struct_tag))))
    25         return NULL;
     24    tag = xzalloc(sizeof(struct blkid_struct_tag));
    2625
    2726    INIT_LIST_HEAD(&tag->bit_tags);
    … …  
    114113{
    115114    blkid_tag   t = 0, head = 0;
    116     char        *val = 0;
     115    char        *val = NULL;
    117116
    118117    if (!dev || !name)
    … …  
    365364{
    366365    blkid_tag_iterate   iter;
    367     blkid_cache         cache = NULL;
     366    blkid_cache     cache = NULL;
    368367    blkid_dev       dev;
    369368    int         c, ret, found;
Note: See TracChangeset for help on using the changeset viewer.