summaryrefslogtreecommitdiffstats
path: root/disk-utils/fsck.cramfs.c
diff options
context:
space:
mode:
authorKarel Zak2006-12-07 00:26:54 +0100
committerKarel Zak2006-12-07 00:26:54 +0100
commit48d7b13a1eab85fab91c8d6c5ddf298f733c74f5 (patch)
tree8813d36590ee3361bd75f57a12fd2032e9296ddb /disk-utils/fsck.cramfs.c
parentImported from util-linux-2.12r tarball. (diff)
downloadkernel-qcow2-util-linux-48d7b13a1eab85fab91c8d6c5ddf298f733c74f5.tar.gz
kernel-qcow2-util-linux-48d7b13a1eab85fab91c8d6c5ddf298f733c74f5.tar.xz
kernel-qcow2-util-linux-48d7b13a1eab85fab91c8d6c5ddf298f733c74f5.zip
Imported from util-linux-2.13-pre1 tarball.
Diffstat (limited to 'disk-utils/fsck.cramfs.c')
-rw-r--r--disk-utils/fsck.cramfs.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 83bf00ac8..d46a56954 100644
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -51,7 +51,6 @@
#include <sys/sysmacros.h> /* for major, minor */
#include "cramfs.h"
-#include "../defines.h" /* for HAVE_lchown */
#include "nls.h"
#define BLKGETSIZE _IO(0x12,96) /* return device size */
@@ -205,10 +204,8 @@ static int uncompress_block(void *src, int len)
return stream.total_out;
}
-#ifdef HAVE_lchown
-#define my_lchown lchown
-#else
-#define my_lchown chown
+#if !HAVE_LCHOWN
+#define lchown chown
#endif
static void change_file_status(char *path, struct cramfs_inode *i)
@@ -216,7 +213,7 @@ static void change_file_status(char *path, struct cramfs_inode *i)
struct utimbuf epoch = { 0, 0 };
if (euid == 0) {
- if (my_lchown(path, i->uid, i->gid) < 0) {
+ if (lchown(path, i->uid, i->gid) < 0) {
perror(path);
exit(8);
}