diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-11-05 13:17:50 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-11-05 13:17:50 +0200 |
| commit | ed412a0e2f8538ab952908b06f24d769f1fd1fb6 (patch) | |
| tree | 6d809804d39b14e88b29d40d7ef14f2968104a20 /build | |
| parent | cbbae4cdb102ac9de4023e6e35ddc668eae09ca9 (diff) | |
| download | rpm-ed412a0e2f8538ab952908b06f24d769f1fd1fb6.tar.gz rpm-ed412a0e2f8538ab952908b06f24d769f1fd1fb6.tar.bz2 rpm-ed412a0e2f8538ab952908b06f24d769f1fd1fb6.zip | |
Kill off per-file cpio map flags
- nothing uses/needs them, one less murky fi->foo allocation less
- apparently a leftover from initial multilib attempts long long ago
Diffstat (limited to 'build')
| -rw-r--r-- | build/files.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/build/files.c b/build/files.c index 7fb7e0478..5d5856421 100644 --- a/build/files.c +++ b/build/files.c @@ -1270,7 +1270,6 @@ static void genCpioListAndHeader(FileList fl, a = (char *)(fi->apath + fi->fc); *a = '\0'; - fi->fmapflags = xcalloc(sizeof(*fi->fmapflags), fi->fc); fi->astriplen = 0; if (fl->buildRoot) fi->astriplen = strlen(fl->buildRoot); @@ -1280,6 +1279,11 @@ static void genCpioListAndHeader(FileList fl, fi->fuser = _free(fi->fuser); fi->fgroup = _free(fi->fgroup); + fi->mapflags = CPIO_MAP_PATH | + CPIO_MAP_TYPE | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID; + if (isSrc) + fi->mapflags |= CPIO_FOLLOW_SYMLINKS; + /* Make the cpio list */ for (i = 0, flp = fl->fileList; i < fi->fc; i++, flp++) { char * b; @@ -1323,11 +1327,6 @@ static void genCpioListAndHeader(FileList fl, continue; } fi->actions[i] = FA_COPYOUT; - fi->fmapflags[i] = CPIO_MAP_PATH | - CPIO_MAP_TYPE | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID; - if (isSrc) - fi->fmapflags[i] |= CPIO_FOLLOW_SYMLINKS; - } if (fip) *fip = fi; |