RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 05-Jun-2017 03:04:44 Branch: rpm-5_4 Handle: 2017060501044200 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmzstd.c Log: - orphans. Summary: Revision Changes Path 1.1.2.6 +4 -4 rpm/rpmio/rpmzstd.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/rpmzstd.c ============================================================================ $ cvs diff -u -r1.1.2.5 -r1.1.2.6 rpmzstd.c --- rpm/rpmio/rpmzstd.c 5 Jun 2017 00:56:36 -0000 1.1.2.5 +++ rpm/rpmio/rpmzstd.c 5 Jun 2017 01:04:42 -0000 1.1.2.6 @@ -3711,7 +3711,7 @@ Fclose(ress.srcfd); if (g_removeSrcFile /* --rm */ && !result && strcmp(srcfn, stdinmark)) { - if (remove(srcfn)) + if (Unlink(srcfn)) EXM_THROW(1, "zstd: %s: %s", srcfn, strerror(errno)); } @@ -3746,7 +3746,7 @@ result=1; } if (result!=0) { /* remove operation artefact */ - if (remove(dstfn)) + if (Unlink(dstfn)) EXM_THROW(1, "zstd: %s: %s", dstfn, strerror(errno)); } else if (strcmp (dstfn, stdoutmark) && stat_result) @@ -4380,7 +4380,7 @@ /* Close file */ if (Fclose(srcfd)) EXM_THROW(33, "zstd: %s close error", srcfn); /* error should never happen */ if (g_removeSrcFile /* --rm */ && strcmp(srcfn, stdinmark)) { - if (remove(srcfn)) + if (Unlink(srcfn)) EXM_THROW(34, "zstd: %s: %s", srcfn, strerror(errno)); } SPEW("<--\t%s(%p, %s, %s) rc %d\n", __FUNCTION__, &ress, dstfn, srcfn, 0); @@ -4413,7 +4413,7 @@ if ( (result != 0) && strcmp(dstfn, nulmark) /* special case : don't remove() /dev/null (#316) */ - && remove(dstfn) ) + && Unlink(dstfn) ) result=1; /* don't do anything special if remove() fails */ else if (strcmp (dstfn, stdoutmark) && stat_result) UTIL_setFileStat(dstfn, &sb); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
