diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-02-02 10:48:06 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-02-02 10:48:06 +0000 |
commit | 04158e04591efea20f34c8dc83002e19056a5590 (patch) | |
tree | 1deace5081207ddefa831e024e5914a11a8aaeeb /e2fsprogs/old_e2fsprogs/ext2fs | |
parent | 512c8ae0537ad2ffcb70db03ca50b532781ae799 (diff) | |
download | busybox-w32-04158e04591efea20f34c8dc83002e19056a5590.tar.gz busybox-w32-04158e04591efea20f34c8dc83002e19056a5590.tar.bz2 busybox-w32-04158e04591efea20f34c8dc83002e19056a5590.zip |
udhcpd: add code which rejects lease files with suspicious or old timestamp.
*: s/time(0)/time(NULL)/g
Diffstat (limited to 'e2fsprogs/old_e2fsprogs/ext2fs')
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/bb_inode.c | 4 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/bb_inode.c b/e2fsprogs/old_e2fsprogs/ext2fs/bb_inode.c index 855f86eac..1deae54e8 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/bb_inode.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/bb_inode.c | |||
@@ -125,9 +125,9 @@ errcode_t ext2fs_update_bb_inode(ext2_filsys fs, ext2_badblocks_list bb_list) | |||
125 | if (retval) | 125 | if (retval) |
126 | goto cleanup; | 126 | goto cleanup; |
127 | 127 | ||
128 | inode.i_atime = inode.i_mtime = time(0); | 128 | inode.i_atime = inode.i_mtime = time(NULL); |
129 | if (!inode.i_ctime) | 129 | if (!inode.i_ctime) |
130 | inode.i_ctime = time(0); | 130 | inode.i_ctime = time(NULL); |
131 | inode.i_blocks = rec.bad_block_count * (fs->blocksize / 512); | 131 | inode.i_blocks = rec.bad_block_count * (fs->blocksize / 512); |
132 | inode.i_size = rec.bad_block_count * fs->blocksize; | 132 | inode.i_size = rec.bad_block_count * fs->blocksize; |
133 | 133 | ||
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c b/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c index 5bdd34682..af47aee18 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c | |||
@@ -231,7 +231,7 @@ static errcode_t write_journal_inode(ext2_filsys fs, ext2_ino_t journal_ino, | |||
231 | 231 | ||
232 | inode.i_size += fs->blocksize * size; | 232 | inode.i_size += fs->blocksize * size; |
233 | inode.i_blocks += (fs->blocksize / 512) * es.newblocks; | 233 | inode.i_blocks += (fs->blocksize / 512) * es.newblocks; |
234 | inode.i_mtime = inode.i_ctime = time(0); | 234 | inode.i_mtime = inode.i_ctime = time(NULL); |
235 | inode.i_links_count = 1; | 235 | inode.i_links_count = 1; |
236 | inode.i_mode = LINUX_S_IFREG | 0600; | 236 | inode.i_mode = LINUX_S_IFREG | 0600; |
237 | 237 | ||
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c b/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c index 31cc89e28..3c550d511 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c | |||
@@ -117,7 +117,7 @@ errcode_t ext2fs_create_resize_inode(ext2_filsys fs) | |||
117 | sb->s_feature_ro_compat |= | 117 | sb->s_feature_ro_compat |= |
118 | EXT2_FEATURE_RO_COMPAT_LARGE_FILE; | 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 | ||
123 | for (rsv_off = 0, gdt_off = fs->desc_blocks, | 123 | for (rsv_off = 0, gdt_off = fs->desc_blocks, |
@@ -209,7 +209,7 @@ out_inode: | |||
209 | inode.i_size); | 209 | inode.i_size); |
210 | #endif | 210 | #endif |
211 | if (inode_dirty) { | 211 | if (inode_dirty) { |
212 | inode.i_atime = inode.i_mtime = time(0); | 212 | inode.i_atime = inode.i_mtime = time(NULL); |
213 | retval2 = ext2fs_write_inode(fs, EXT2_RESIZE_INO, &inode); | 213 | retval2 = ext2fs_write_inode(fs, EXT2_RESIZE_INO, &inode); |
214 | if (!retval) | 214 | if (!retval) |
215 | retval = retval2; | 215 | retval = retval2; |