Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs
- Timestamp:
- Feb 25, 2011, 9:26:54 PM (13 years ago)
- Location:
- branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs
- Files:
-
- 1 added
- 51 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild
r1765 r2725 1 # DO NOT EDIT. This file is generated from Kbuild.src 1 2 # Makefile for busybox 2 3 # 3 4 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> 4 5 # 5 # Licensed under the GPL v2, see the file LICENSE in this tarball.6 # Licensed under GPLv2, see file LICENSE in this source tree. 6 7 7 8 NEEDED-$(CONFIG_E2FSCK) = y … … 11 12 12 13 lib-y:= 14 15 16 13 17 lib-$(NEEDED-y) += gen_bitmap.o bitops.o ismounted.o mkjournal.o unix_io.o \ 14 18 rw_bitmaps.o initialize.o bitmaps.o block.o \ -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/alloc.c
r1765 r2725 110 110 errcode_t retval; 111 111 blk_t block; 112 char *buf = 0;112 char *buf = NULL; 113 113 114 114 if (!block_buf) { … … 172 172 return EXT2_ET_BLOCK_ALLOC_FAIL; 173 173 } 174 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/alloc_tables.c
r1765 r2725 98 98 } 99 99 100 101 100 return 0; 102 101 } 103 104 105 102 106 103 errcode_t ext2fs_allocate_tables(ext2_filsys fs) … … 116 113 return 0; 117 114 } 118 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/bb_inode.c
r1765 r2725 126 126 goto cleanup; 127 127 128 inode.i_atime = inode.i_mtime = time( 0);128 inode.i_atime = inode.i_mtime = time(NULL); 129 129 if (!inode.i_ctime) 130 inode.i_ctime = time( 0);130 inode.i_ctime = time(NULL); 131 131 inode.i_blocks = rec.bad_block_count * (fs->blocksize / 512); 132 132 inode.i_size = rec.bad_block_count * fs->blocksize; … … 261 261 return BLOCK_CHANGED; 262 262 } 263 264 265 266 267 268 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/bitops.c
r1765 r2725 66 66 } 67 67 68 #endif 68 #endif /* !_EXT2_HAVE_ASM_BITOPS_ */ 69 69 70 70 void ext2fs_warn_bitmap(errcode_t errcode, unsigned long arg, … … 89 89 #endif 90 90 } 91 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/bitops.h
r1765 r2725 14 14 * Linus Torvalds. 15 15 */ 16 17 16 #include <string.h> 18 //#include <strings.h>19 17 20 18 extern int ext2fs_set_bit(unsigned int nr,void * addr); -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/block.c
r1765 r2725 436 436 block_buf, xlate_func, &xl); 437 437 } 438 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/bmap.c
r1765 r2725 137 137 blk_t addr_per_block; 138 138 blk_t b; 139 char *buf = 0;139 char *buf = NULL; 140 140 errcode_t retval = 0; 141 141 int blocks_alloc = 0, inode_dirty = 0; … … 260 260 return retval; 261 261 } 262 263 264 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/bmove.c
r1765 r2725 154 154 return 0; 155 155 } 156 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/brel.h
r1765 r2725 85 85 #define ext2fs_brel_delete(brel, old) ((brel)->delete((brel), old)) 86 86 #define ext2fs_brel_free(brel) ((brel)->free((brel))) 87 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/closefs.c
r1765 r2725 207 207 errcode_t retval; 208 208 unsigned long fs_state; 209 struct ext2_super_block *super_shadow = 0;210 struct ext2_group_desc *group_shadow = 0;209 struct ext2_super_block *super_shadow = NULL; 210 struct ext2_group_desc *group_shadow = NULL; 211 211 char *group_ptr; 212 212 int old_desc_blocks; … … 379 379 return 0; 380 380 } 381 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/cmp_bitmaps.c
r1765 r2725 71 71 return 0; 72 72 } 73 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/dir_iterate.c
r1765 r2725 218 218 return 0; 219 219 } 220 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/dirblock.c
r1765 r2725 81 81 errcode_t retval; 82 82 char *p, *end; 83 char *buf = 0;83 char *buf = NULL; 84 84 struct ext2_dir_entry *dirent; 85 85 … … 131 131 return ext2fs_write_dir_block2(fs, block, inbuf, 0); 132 132 } 133 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/dirhash.c
r1765 r2725 43 43 b0 += ((b1 << 4)+a) ^ (b1+sum) ^ ((b1 >> 5)+b); 44 44 b1 += ((b0 << 4)+c) ^ (b0+sum) ^ ((b0 >> 5)+d); 45 } while (--n);45 } while (--n); 46 46 47 47 buf[0] += b0; -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/dupfs.c
r1765 r2725 93 93 ext2fs_free(fs); 94 94 return retval; 95 96 95 } 97 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/e2image.h
r1765 r2725 38 38 __u32 offset_reserved[8]; 39 39 }; 40 41 42 43 44 45 46 47 48 49 50 51 52 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext2_ext_attr.h
r1765 r2725 51 51 #define EXT2_XATTR_SIZE(size) \ 52 52 (((size) + EXT2_EXT_ATTR_ROUND) & ~EXT2_EXT_ATTR_ROUND) 53 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h
r1765 r2725 14 14 * Copyright (C) 1991, 1992 Linus Torvalds 15 15 */ 16 17 #ifndef _LINUX_EXT2_FS_H 18 #define _LINUX_EXT2_FS_H 16 #ifndef LINUX_EXT2_FS_H 17 #define LINUX_EXT2_FS_H 1 19 18 20 19 #include "ext2_types.h" /* Changed from linux/types.h */ … … 568 567 ~EXT2_DIR_ROUND) 569 568 570 #endif /* _LINUX_EXT2_FS_H */569 #endif -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext2_io.h
r1765 r2725 10 10 * %End-Header% 11 11 */ 12 13 #ifndef _EXT2FS_EXT2_IO_H 14 #define _EXT2FS_EXT2_IO_H 12 #ifndef EXT2FS_EXT2_IO_H 13 #define EXT2FS_EXT2_IO_H 1 15 14 16 15 /* … … 111 110 (int blksize, errcode_t err); 112 111 113 #endif /* _EXT2FS_EXT2_IO_H */ 114 112 #endif -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h
r1765 r2725 10 10 * %End-Header% 11 11 */ 12 13 #ifndef _EXT2FS_EXT2FS_H 14 #define _EXT2FS_EXT2FS_H 12 #ifndef EXT2FS_EXT2FS_H 13 #define EXT2FS_EXT2FS_H 1 15 14 16 15 … … 921 920 #endif 922 921 923 #endif /* _EXT2FS_EXT2FS_H */922 #endif -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext2fsP.h
r1765 r2725 86 86 int ref_offset, 87 87 void *priv_data); 88 89 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c
r1765 r2725 51 51 * with C99 strict type aliasing rules. */ 52 52 memcpy(&p, ptr, sizeof (p)); 53 p = realloc(p, size); 54 if (!p) 55 return EXT2_ET_NO_MEMORY; 53 p = xrealloc(p, size); 56 54 memcpy(ptr, &p, sizeof (p)); 57 55 return 0; -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext_attr.c
r1765 r2725 69 69 errcode_t retval; 70 70 struct ext2_ext_attr_header *header; 71 char *buf = 0;71 char *buf = NULL; 72 72 73 73 if ((blk >= fs->super->s_blocks_count) || -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/finddev.c
r1765 r2725 116 116 char *ext2fs_find_block_device(dev_t device) 117 117 { 118 struct dir_list *list = 0, *new_list = 0;118 struct dir_list *list = NULL, *new_list = NULL; 119 119 struct dir_list *current; 120 char *ret_path = 0;120 char *ret_path = NULL; 121 121 122 122 /* -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/flushb.c
r1765 r2725 24 24 #if HAVE_SYS_MOUNT_H 25 25 #include <sys/param.h> 26 #include <sys/mount.h> 26 #include <sys/mount.h> /* This may define BLKFLSBUF */ 27 27 #endif 28 28 … … 39 39 #ifdef __linux__ 40 40 #ifndef BLKFLSBUF 41 #define BLKFLSBUF _IO(0x12,97)/* flush buffer cache */41 #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ 42 42 #endif 43 43 #ifndef FDFLUSH 44 #define FDFLUSH _IO(2,0x4b)/* flush floppy disk */44 #define FDFLUSH _IO(2,0x4b) /* flush floppy disk */ 45 45 #endif 46 46 #endif -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/freefs.c
r1765 r2725 126 126 ext2fs_free_mem(&dblist); 127 127 } 128 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/get_pathname.c
r1765 r2725 154 154 ext2fs_free_mem(&buf); 155 155 return retval; 156 157 156 } -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/getsize.c
r1765 r2725 79 79 dev = CreateFile(file, GENERIC_READ, 80 80 FILE_SHARE_READ | FILE_SHARE_WRITE , 81 NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,NULL);81 NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); 82 82 83 83 if (dev == INVALID_HANDLE_VALUE) -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/imager.c
r1765 r2725 334 334 errcode_t ext2fs_image_bitmap_read(ext2_filsys fs, int fd, int flags) 335 335 { 336 char *ptr, *buf = 0;336 char *ptr, *buf = NULL; 337 337 int size; 338 338 ssize_t actual; -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ind_block.c
r1765 r2725 68 68 return io_channel_write_blk(fs->io, blk, 1, buf); 69 69 } 70 71 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/inline.c
r1765 r2725 2 2 /* 3 3 * inline.c --- Includes the inlined functions defined in the header 4 * 5 * 4 * files as standalone functions, in case the application program 5 * is compiled with inlining turned off. 6 6 * 7 7 * Copyright (C) 1993, 1994 Theodore Ts'o. … … 31 31 #define INCLUDE_INLINE_FUNCS 32 32 #include "ext2fs.h" 33 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/inode.c
r1765 r2725 765 765 return 0; 766 766 } 767 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/inode_io.c
r1765 r2725 269 269 return ext2fs_file_flush(data->file); 270 270 } 271 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ismounted.c
r1765 r2725 60 60 #ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */ 61 61 file_rdev = st_buf.st_rdev; 62 #endif 62 #endif /* __GNU__ */ 63 63 } else { 64 64 file_dev = st_buf.st_dev; … … 74 74 if (file_rdev && (file_rdev == st_buf.st_rdev)) 75 75 break; 76 #endif 76 #endif /* __GNU__ */ 77 77 } else { 78 78 if (file_dev && ((file_dev == st_buf.st_dev) && … … 100 100 } 101 101 } 102 #endif 102 #endif /* __GNU__ */ 103 103 goto errout; 104 104 } … … 248 248 S_ISBLK(st_buf.st_mode)) 249 249 file_dev = st_buf.st_rdev; 250 #endif 251 252 if (!(f = fopen ("/proc/swaps", "r")))250 #endif /* __GNU__ */ 251 252 if (!(f = fopen_for_read("/proc/swaps"))) 253 253 return 0; 254 254 /* Skip the first line */ … … 272 272 break; 273 273 } 274 #endif 274 #endif /* __GNU__ */ 275 275 } 276 276 fclose(f); -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/jfs_dat.h
r1765 r2725 61 61 __u32 s_sequence; /* first commit ID expected in log */ 62 62 __u32 s_start; /* blocknr of start of log */ 63 64 63 } journal_superblock_t; 65 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/kernel-jbd.h
r1765 r2725 14 14 * filesystem journaling support. 15 15 */ 16 17 #ifndef _LINUX_JBD_H 18 #define _LINUX_JBD_H 16 #ifndef LINUX_JBD_H 17 #define LINUX_JBD_H 1 19 18 20 19 #include <sys/types.h> … … 234 233 235 234 236 #endif /* _LINUX_JBD_H */235 #endif -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/kernel-list.h
r1765 r2725 1 1 /* vi: set sw=4 ts=4: */ 2 #ifndef _LINUX_LIST_H3 #define _LINUX_LIST_H2 #ifndef LINUX_LIST_H 3 #define LINUX_LIST_H 1 4 4 5 5 /* -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/lookup.c
r1765 r2725 67 67 return (ls.found) ? 0 : EXT2_ET_FILE_NOT_FOUND; 68 68 } 69 70 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/mkdir.c
r1765 r2725 40 40 ext2_ino_t scratch_ino; 41 41 blk_t blk; 42 char *block = 0;42 char *block = NULL; 43 43 44 44 EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); … … 137 137 ext2fs_free_mem(&block); 138 138 return retval; 139 140 139 } 141 142 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c
r1765 r2725 96 96 { 97 97 errcode_t retval; 98 char *buf = 0;98 char *buf = NULL; 99 99 int fd, ret_size; 100 100 blk_t i; … … 189 189 else 190 190 return BLOCK_CHANGED; 191 192 191 } 193 192 … … 232 231 inode.i_size += fs->blocksize * size; 233 232 inode.i_blocks += (fs->blocksize / 512) * es.newblocks; 234 inode.i_mtime = inode.i_ctime = time( 0);233 inode.i_mtime = inode.i_ctime = time(NULL); 235 234 inode.i_links_count = 1; 236 235 inode.i_mode = LINUX_S_IFREG | 0600; … … 424 423 ext2fs_close(fs); 425 424 exit(0); 426 427 } 428 #endif 425 } 426 #endif -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/namei.c
r1765 r2725 31 31 { 32 32 char *pathname; 33 char *buffer = 0;33 char *buffer = NULL; 34 34 errcode_t retval; 35 35 struct ext2_inode ei; … … 49 49 return EXT2_ET_SYMLINK_LOOP; 50 50 } 51 if (ext2fs_inode_data_blocks(fs, &ei)) {51 if (ext2fs_inode_data_blocks(fs, &ei)) { 52 52 retval = ext2fs_get_mem(fs->blocksize, &buffer); 53 53 if (retval) … … 203 203 return retval; 204 204 } 205 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/newdir.c
r1765 r2725 67 67 dir->name[0] = '.'; 68 68 dir->name[1] = '.'; 69 70 69 } 71 70 *block = buf; -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/read_bb.c
r1765 r2725 95 95 return rb.err; 96 96 } 97 98 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/read_bb_file.c
r1765 r2725 95 95 call_compat_invalid); 96 96 } 97 98 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c
r1765 r2725 114 114 inode.i_size = inode_size & 0xFFFFFFFF; 115 115 inode.i_size_high = (inode_size >> 32) & 0xFFFFFFFF; 116 if (inode.i_size_high) {116 if (inode.i_size_high) { 117 117 sb->s_feature_ro_compat |= 118 118 EXT2_FEATURE_RO_COMPAT_LARGE_FILE; 119 119 } 120 inode.i_ctime = time( 0);120 inode.i_ctime = time(NULL); 121 121 } 122 122 … … 210 210 #endif 211 211 if (inode_dirty) { 212 inode.i_atime = inode.i_mtime = time( 0);212 inode.i_atime = inode.i_mtime = time(NULL); 213 213 retval2 = ext2fs_write_inode(fs, EXT2_RESIZE_INO, &inode); 214 214 if (!retval) … … 219 219 return retval; 220 220 } 221 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/rs_bitmap.c
r1765 r2725 105 105 return retval; 106 106 } 107 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/rw_bitmaps.c
r1765 r2725 150 150 { 151 151 dgrp_t i; 152 char *block_bitmap = 0, *inode_bitmap = 0;152 char *block_bitmap = NULL, *inode_bitmap = NULL; 153 153 char *buf; 154 154 errcode_t retval; … … 267 267 errcode_t ext2fs_read_bitmaps(ext2_filsys fs) 268 268 { 269 270 269 EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); 271 270 … … 294 293 return 0; 295 294 } 296 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/swapfs.c
r1765 r2725 67 67 for (i=0; i < 17; i++) 68 68 sb->s_jnl_blocks[i] = ext2fs_swab32(sb->s_jnl_blocks[i]); 69 70 69 } 71 70 … … 223 222 bufsize - sizeof(struct ext2_inode) - 224 223 t->i_extra_isize - sizeof(__u32), 0); 225 226 224 } 227 225 -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/test_io.c
r1765 r2725 181 181 data->outfile = NULL; 182 182 if ((value = getenv("TEST_IO_LOGFILE")) != NULL) 183 data->outfile = fopen (value, "w");183 data->outfile = fopen_for_write(value); 184 184 if (!data->outfile) 185 185 data->outfile = stderr; -
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/unlink.c
r1765 r2725 98 98 return (ls.done) ? 0 : EXT2_ET_DIR_NO_SPACE; 99 99 } 100
Note:
See TracChangeset
for help on using the changeset viewer.