/pidgin/main: a9504b165b27: Rip out "only" list support from our...

Mark Doliner mark at kingant.net
Wed Oct 22 10:20:23 EDT 2014


Changeset: a9504b165b27e67d42b0f9f0f71df2c54cc92345
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2014-03-01 17:13 -0800
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/a9504b165b27

Description:

Rip out "only" list support from our Windows untar code.

We don't use it, and it's easier for me to rip it out than try to
figure out if my change broke the if statement here.

diffstat:

 pidgin/win32/untar.c |  22 ----------------------
 1 files changed, 0 insertions(+), 22 deletions(-)

diffs (39 lines):

diff --git a/pidgin/win32/untar.c b/pidgin/win32/untar.c
--- a/pidgin/win32/untar.c
+++ b/pidgin/win32/untar.c
@@ -122,8 +122,6 @@ static const char *inname  = NULL;      
 static FILE	  *infp    = NULL;      /* input byte stream */
 static FILE	  *outfp   = NULL;      /* output stream, for file currently being extracted */
 static Ulong_t	  outsize  = 0;         /* number of bytes remainin in file currently being extracted */
-static char	  **only   = NULL;      /* array of filenames to extract/list */
-static int	  nonlys   = 0;	        /* number of filenames in "only" array; 0=extract all */
 static int	  didabs   = 0;	        /* were any filenames affected by the absence of -p? */
 
 static untar_opt untarops = 0;          /* Untar options */
@@ -472,26 +470,6 @@ static int untar_block(Uchar_t *blk) {
 		}
 #endif
 
-		/* If we have an "only" list, and this file isn't in it,
-		 * then skip it.
-		 */
-		if (nonlys > 0)
-		{
-			for (i = 0;
-			     i < nonlys
-				&& strcmp(only[i], nbuf)
-				&& (strncmp(only[i], nbuf, strlen(only[i]))
-					|| nbuf[strlen(only[i])] != '/');
-				i++)
-			{
-			}
-			if (i >= nonlys)
-			{
-				outfp = NULL;
-				return 1;
-			}
-		}
-
 		/* list the file */
 		if (VERBOSE)
 			untar_verbose("%c %s",



More information about the Commits mailing list