From f446297afd6b1d0c2558038f198a929082f820f7 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Fri, 1 Sep 2000 02:50:48 +0000 Subject: [PATCH] Don't unlink files if we are extracting to stdout. --- archival/tar.c | 6 +++--- tar.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/archival/tar.c b/archival/tar.c index cab53aa10..597e9b80d 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -600,9 +600,9 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag, printf("\n"); } - /* Remove any clutter lying in our way */ - if (extractFlag == TRUE) /* .. but only if we are extracting (as */ - unlink( header.name); /* opposed to listing) (rob@sysgo.de) */ + /* Remove files if we would overwrite them */ + if (extractFlag == TRUE && tostdOut == FALSE) + unlink(header.name); /* If we got here, we can be certain we have a legitimate * header to work with. So work with it. */ diff --git a/tar.c b/tar.c index cab53aa10..597e9b80d 100644 --- a/tar.c +++ b/tar.c @@ -600,9 +600,9 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag, printf("\n"); } - /* Remove any clutter lying in our way */ - if (extractFlag == TRUE) /* .. but only if we are extracting (as */ - unlink( header.name); /* opposed to listing) (rob@sysgo.de) */ + /* Remove files if we would overwrite them */ + if (extractFlag == TRUE && tostdOut == FALSE) + unlink(header.name); /* If we got here, we can be certain we have a legitimate * header to work with. So work with it. */