summaryrefslogtreecommitdiff
path: root/rpmio
diff options
context:
space:
mode:
authorjbj <devnull@localhost>1999-10-30 21:26:45 +0000
committerjbj <devnull@localhost>1999-10-30 21:26:45 +0000
commit3d087dcf52531f766af0c503a6cbddfaef84f86a (patch)
tree120f7f89e102fd6af16799a27d5396cd5a5112c2 /rpmio
parent2b84d36c2edb0acd8f47bd3316e1535cfdf60fc0 (diff)
downloadrpm-3d087dcf52531f766af0c503a6cbddfaef84f86a.tar.gz
Rename faFoo() routines, use FD_t I/O with fadio cookie throughout.
Try to be URL sensitive on filename arguments throughout. falloc.c: Eliminate faFile, use FD_t. falloc.c: preserve abstract FD_t by creating fadGet*()/fadSet*(). macro.c: rpmGetPath() expansions were clobbering URL's. rpmio.c: create Fcntl(), Pread(), Pwrite() from previous faFoo(). rpmio.c: attempt per FD_t debugging. rpm.c: permit --dbpath with --rebuild. CVS patchset: 3408 CVS date: 1999/10/30 21:26:45
Diffstat (limited to 'rpmio')
-rw-r--r--rpmio/macro.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/rpmio/macro.c b/rpmio/macro.c
index afc0aca66..10e329e6b 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -1462,7 +1462,8 @@ rpmGetPath(const char *path, ...)
expandMacros(NULL, NULL, buf, sizeof(buf));
for (s = p = buf; *s; s++, p++) {
- while (s[0] == '/' && s[1] == '/') s++;
+ if (!(s > buf && s[-1] == ':'))
+ while (s[0] == '/' && s[1] == '/') s++;
*p = *s;
}
*p = '\0';