pidgin3: comparison pidgin/win32/untar.c

-:502c78a7f11f
+:a5381c20e802
 #include <glib/gstdio.h>
 #include <purple.h>
 #include "untar.h"
-#define untar_error( error, args... )      purple_debug(PURPLE_DEBUG_ERROR, "untar", error, ## args )
-#define untar_warning( warning, args... )  purple_debug(PURPLE_DEBUG_WARNING, "untar", warning, ## args )
-#define untar_verbose( args... )           purple_debug(PURPLE_DEBUG_INFO, "untar", ## args )
 #define WSIZE	32768	/* size of decompression buffer */
 #define TSIZE	512	/* size of a "tape" block */
 #define CR	13	/* carriage-return character */
 #define LF	10	/* line-feed character */
 	int	i;
 	/* if we aren't allowed to overwrite and this file exists, return NULL */
 	if (!FORCE && access(name, 0) == 0)
 	{
-		untar_warning("%s: exists, will not overwrite without \"FORCE option\"\n", name);
+		purple_debug_warning("untar", "%s: exists, will not overwrite without \"FORCE option\"", name);
 		return NULL;
 	}
 	/* first try creating it the easy way */
 	fp = g_fopen(name, CONVERT ? "w" : "wb");
 			name[i] = '/';
 		}
 	}
 	fp = g_fopen(name, CONVERT ? "w" : "wb");
 	if (!fp)
-		untar_error("Error opening: %s\n", name);
+		purple_debug_error("untar", "Error opening: %s", name);
 	return fp;
 }
 /* Create a link, or copy a file.  If the file is copied (not linked) then
 * give a warning.
 	/* Open the source file.  We do this first to make sure it exists */
 	fpsrc = g_fopen(src, "rb");
 	if (!fpsrc)
 	{
-		untar_error("Error opening: %s\n", src);
+		purple_debug_error("untar", "Error opening: %s", src);
 		return;
 	}
 	/* Create the destination file.  On POSIX systems, this is just to
 	 * make sure the directory path exists.
 	/* Close the files */
 	fclose(fpsrc);
 	fclose(fpdst);
 	/* Give a warning */
-	untar_warning("%s: copy instead of link\n", dst);
+	purple_debug_warning("untar", "%s: copy instead of link", dst);
 }
 /* This calls fwrite(), possibly after converting CR-LF to LF */
 static void cvtwrite(blk, size, fp)
 	Uchar_t	*blk;	/* the block to be written */
 	}
 	else if ((tblk)->filename[0] == '\0')
 	{
 		/* end-of-archive marker */
 		if (didabs)
-			untar_warning("Removed leading slashes because \"ABSPATH option\" wasn't given.\n");
+			purple_debug_warning("untar", "Removed leading slashes because \"ABSPATH option\" wasn't given.");
 		return 1;
 	}
 	else
 	{
 		/* file header */
 			&& (tblk)->size[0] != ' ')
 		 || (tblk)->size[0] > '9')
 		{
 			if (first)
 			{
-				untar_error("%s: not a valid tar file\n", inname);
+				purple_debug_error("untar", "%s: not a valid tar file", inname);
 				return 0;
 			}
 			else
 			{
-				untar_error("Garbage detected; preceding file may be damaged\n");
+				purple_debug_error("untar", "Garbage detected; preceding file may be damaged");
 				return 0;
 			}
 		}
 		/* combine prefix and filename */
 						&& (tblk)->checksum[i] <= '7')
 				sum = sum * 8 + (tblk)->checksum[i] - '0';
 		}
 		if (sum != checksum(tblk, 0) && sum != checksum(tblk, 1))
 		{
-			if (!first)
+			if (!first) {
-				untar_error("Garbage detected; preceding file may be damaged\n");
+				purple_debug_error("untar", "Garbage detected; preceding file may be damaged");
-			untar_error("%s: header has bad checksum for %s\n", inname, nbuf);
+			}
+			purple_debug_error("untar", "%s: header has bad checksum for %s", inname, nbuf);
 			return 0;
 		}
 		/* From this point on, we don't care whether this is the first
 		 * block or not.  Might as well reset the "first" flag now.
 		}
 #endif
 		/* list the file */
 		if (VERBOSE)
-			untar_verbose("%c %s",
+			purple_debug_info("untar", "%c %s",
 				ISREGULAR(*tblk) ? '-' : ("hlcbdp"[(tblk)->type - '1']),
 				nbuf);
 		else if (!QUIET)
-			untar_verbose("%s\n", nbuf);
+			purple_debug_info("untar", "%s", nbuf);
 		/* if link, then do the link-or-copy thing */
 		if (tblk->type == '1' || tblk->type == '2')
 		{
 			if (VERBOSE)
-				untar_verbose(" -> %s\n", tblk->linkto);
+				purple_debug_info("untar", " -> %s", tblk->linkto);
 			if (!LISTING)
 				linkorcopy(tblk->linkto, nbuf, tblk->type == '2');
 			outsize = 0L;
 			return 1;
 		}
 #endif
 				tmp = " created";
 			else
 				tmp = " ignored";
 			if (VERBOSE)
-				untar_verbose("%s\n", tmp);
+				purple_debug_info("untar", "%s", tmp);
 			return 1;
 		}
 		/* if not a regular file, then skip it */
 		if (!ISREGULAR(*tblk))
 		{
 			if (VERBOSE)
-				untar_verbose(" ignored\n");
+				purple_debug_info("untar", " ignored");
 			outsize = 0L;
 			return 1;
 		}
 		/* print file statistics */
 		if (VERBOSE)
 		{
-			untar_verbose(" (%ld byte%s, %ld tape block%s)\n",
+			purple_debug_info("untar", " (%ld byte%s, %ld tape block%s)",
 				outsize,
 				outsize == 1 ? "" : "s",
 				(outsize + TSIZE - 1) / TSIZE,
 				(outsize > 0  && outsize <= TSIZE) ? "" : "s");
 		}
 	/* open the archive */
 	inname = filename;
 	infp = g_fopen(filename, "rb");
 	if (!infp)
 	{
-		untar_error("Error opening: %s\n", filename);
+		purple_debug_error("untar", "Error opening: %s", filename);
 		return 0;
 	}
 	w_destdir = g_utf8_to_utf16(destdir, -1, NULL, NULL, NULL);
 	/* Set current directory */
 	if(!GetCurrentDirectoryW(_MAX_PATH, curdir)) {
-		untar_error("Could not get current directory (error %lu).\n", GetLastError());
+		purple_debug_error("untar", "Could not get current directory (error %lu).", GetLastError());
 		fclose(infp);
 		return 0;
 	}
 	if(!SetCurrentDirectoryW(w_destdir)) {
-		untar_error("Could not set current directory to (error %lu): %s\n", GetLastError(), destdir);
+		purple_debug_error("untar", "Could not set current directory to (error %lu): %s", GetLastError(), destdir);
 		fclose(infp);
 		return 0;
 	} else {
 		/* UNCOMPRESSED */
 		/* send each block to the untar_block() function */
 		while (fread(slide, 1, TSIZE, infp) == TSIZE) {
 			if(!untar_block(slide)) {
-				untar_error("untar failure: %s\n", filename);
+				purple_debug_error("untar", "untar failure: %s", filename);
 				fclose(infp);
 				ret=0;
 			}
 		}
 		if (outsize > 0 && ret) {
-			untar_warning("Last file might be truncated!\n");
+			purple_debug_warning("untar", "Last file might be truncated!");
 			fclose(outfp);
 			outfp = NULL;
 		}
 		if(!SetCurrentDirectoryW(curdir)) {
-			untar_error("Could not set current dir back to original (error %lu).\n", GetLastError());
+			purple_debug_error("untar", "Could not set current dir back to original (error %lu).", GetLastError());
 			ret=0;
 		}
 	}
 	g_free(w_destdir);

Mercurial > pidgin3 / file comparison

comparison: pidgin/win32/untar.c

pidgin/win32/untar.c