diff options
| author | jbj <devnull@localhost> | 1999-09-19 00:29:44 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 1999-09-19 00:29:44 +0000 |
| commit | 29c1a3598ac127c4b2b0b936a2edd6c76ce82325 (patch) | |
| tree | 2d0393f97f899b768f4b76ad208a99cc1cc915e0 /lib/cpio.c | |
| parent | b0f03239bbd48ef228e0f390e0f6afd94b27c316 (diff) | |
| download | librpm-tizen-29c1a3598ac127c4b2b0b936a2edd6c76ce82325.tar.gz librpm-tizen-29c1a3598ac127c4b2b0b936a2edd6c76ce82325.tar.bz2 librpm-tizen-29c1a3598ac127c4b2b0b936a2edd6c76ce82325.zip | |
do versioned provides/conflicts resolution correctly.
rpmpopt: display versioned provides/obsoletes.
revert to shared libbz2.so now that bzip2 is in base install.
CVS patchset: 3304
CVS date: 1999/09/19 00:29:44
Diffstat (limited to 'lib/cpio.c')
| -rw-r--r-- | lib/cpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/cpio.c b/lib/cpio.c index 9a9e69ec0..8496c57a9 100644 --- a/lib/cpio.c +++ b/lib/cpio.c @@ -179,7 +179,7 @@ static int strntoul(const char *str, /*@out@*/char **endptr, int base, int num) if (*end) *endptr = ((char *)str) + (end - buf); /* XXX discards const */ else - *endptr = ""; + *endptr = ((char *)str) + strlen(str); return strtoul(buf, endptr, base); } @@ -482,7 +482,7 @@ static int expandDevice(/*@unused@*/CFD_t * cfd, struct cpioHeader * hdr) return CPIOERR_UNLINK_FAILED; } - if (mknod(hdr->path, hdr->mode & (~0777), hdr->rdev)) + if (/*@-unrecog@*/ mknod(hdr->path, hdr->mode & (~0777), hdr->rdev) /*@=unrecog@*/) return CPIOERR_MKNOD_FAILED; return 0; |