SHA256
3
0
forked from pool/rpm
Michael Schröder 2010-06-04 13:48:58 +00:00 committed by Git OBS Bridge
parent e7d0fef0bb
commit 1bb203d6bb

View File

@ -1,5 +1,5 @@
--- ./lib/fsm.c.orig 2010-06-04 12:34:06.000000000 +0000 --- ./lib/fsm.c.orig 2010-06-04 13:47:57.000000000 +0000
+++ ./lib/fsm.c 2010-06-04 12:36:46.000000000 +0000 +++ ./lib/fsm.c 2010-06-04 13:48:07.000000000 +0000
@@ -1323,6 +1323,21 @@ static const char * rpmteTypeString(rpmt @@ -1323,6 +1323,21 @@ static const char * rpmteTypeString(rpmt
} }
} }
@ -21,8 +21,8 @@
+ +
#define IS_DEV_LOG(_x) \ #define IS_DEV_LOG(_x) \
((_x) != NULL && strlen(_x) >= (sizeof("/dev/log")-1) && \ ((_x) != NULL && strlen(_x) >= (sizeof("/dev/log")-1) && \
!strncmp((_x), "/dev/log", sizeof("/dev/log")-1) && \ rstreqn((_x), "/dev/log", sizeof("/dev/log")-1) && \
@@ -2028,11 +2043,8 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS @@ -2027,11 +2042,8 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS
break; break;
case FSM_UNLINK: case FSM_UNLINK:
@ -36,7 +36,7 @@
rc = unlink(fsm->path); rc = unlink(fsm->path);
if (_fsm_debug && (stage & FSM_SYSCALL)) if (_fsm_debug && (stage & FSM_SYSCALL))
rpmlog(RPMLOG_DEBUG, " %8s (%s) %s\n", cur, rpmlog(RPMLOG_DEBUG, " %8s (%s) %s\n", cur,
@@ -2041,6 +2053,8 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS @@ -2040,6 +2052,8 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS
rc = (errno == ENOENT ? CPIOERR_ENOENT : CPIOERR_UNLINK_FAILED); rc = (errno == ENOENT ? CPIOERR_ENOENT : CPIOERR_UNLINK_FAILED);
break; break;
case FSM_RENAME: case FSM_RENAME: