Always report the applet name when doing error reporting.

4 files changed, 25 insertions, 25 deletions

diff --git a/archival/ar.c b/archival/ar.c
index 27dfadd1d..a43cc1dff 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -158,12 +158,12 @@ static int copySubFile(int srcFd, int dstFd, int copySize)
 			readSize = copySize;
 		writeSize = fullRead(srcFd, buffer, readSize);
 		if (writeSize <= 0) {
-			errorMsg(io_error, "copySubFile :", strerror(errno));
+			errorMsg(io_error, "copySubFile", strerror(errno));
 			return (FALSE);
 		}
 		doneSize = fullWrite(dstFd, buffer, writeSize);
 		if (doneSize <= 0) {
-			errorMsg(io_error, "copySubFile :", strerror(errno));
+			errorMsg(io_error, "copySubFile", strerror(errno));
 			return (FALSE);
 		}
 		copySize -= doneSize;
@@ -220,7 +220,7 @@ static int getArFd(char *filename)
 		return (FALSE);
 	}
         if (fullRead(arFd, arVersion, 8) <= 0) {
-                errorMsg( "ar: Unexpected EOF in archive\n");
+                errorMsg( "Unexpected EOF in archive\n");
                 return (FALSE);
         }
         if (strncmp(arVersion,"!<arch>",7) != 0) {
diff --git a/archival/gunzip.c b/archival/gunzip.c
index e6b8202c8..89e46a686 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -212,7 +212,7 @@ extern int method;				/* compression method */
 #  define DECLARE(type, array, size)  type * array
 #  define ALLOC(type, array, size) { \
       array = (type*)calloc((size_t)(((size)+1L)/2), 2*sizeof(type)); \
-      if (array == NULL) errorMsg(memory_exhausted, "gunzip"); \
+      if (array == NULL) errorMsg(memory_exhausted); \
    }
 #  define FREE(array) {if (array != NULL) free(array), array=NULL;}
 #else
@@ -930,7 +930,7 @@ int in, out;					/* input and output file descriptors */
 		int res = inflate();
 
 		if (res == 3) {
-			errorMsg(memory_exhausted, "gunzip");
+			errorMsg(memory_exhausted);
 		} else if (res != 0) {
 			errorMsg("invalid compressed data--format violated");
 		}
diff --git a/archival/gzip.c b/archival/gzip.c
index 9248cfecd..8bc67d9c6 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -127,7 +127,7 @@ extern int method;				/* compression method */
 #  define DECLARE(type, array, size)  type * array
 #  define ALLOC(type, array, size) { \
       array = (type*)calloc((size_t)(((size)+1L)/2), 2*sizeof(type)); \
-      if (array == NULL) errorMsg(memory_exhausted, "gzip"); \
+      if (array == NULL) errorMsg(memory_exhausted); \
    }
 #  define FREE(array) {if (array != NULL) free(array), array=NULL;}
 #else
@@ -3251,7 +3251,7 @@ char *env;						/* name of environment variable */
 	nargv = (char **) calloc(*argcp + 1, sizeof(char *));
 
 	if (nargv == NULL)
-		errorMsg(memory_exhausted, "gzip");
+		errorMsg(memory_exhausted);
 	oargv = *argvp;
 	*argvp = nargv;
 
diff --git a/archival/tar.c b/archival/tar.c
index af017d112..353694f33 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -330,7 +330,7 @@ tarExtractRegularFile(TarInfo *header, int extractFlag, int tostdoutFlag)
 		}
 		if ( (readSize = fullRead(header->tarFd, buffer, readSize)) <= 0 ) {
 			/* Tarball seems to have a problem */
-			errorMsg("tar: Unexpected EOF in archive\n"); 
+			errorMsg("Unexpected EOF in archive\n"); 
 			return( FALSE);
 		}
 		if ( readSize < writeSize )
@@ -368,7 +368,7 @@ tarExtractDirectory(TarInfo *header, int extractFlag, int tostdoutFlag)
 		return( TRUE);
 
 	if (createPath(header->name, header->mode) != TRUE) {
-		errorMsg("tar: %s: Cannot mkdir: %s\n", 
+		errorMsg("%s: Cannot mkdir: %s\n", 
 				header->name, strerror(errno)); 
 		return( FALSE);
 	}
@@ -388,7 +388,7 @@ tarExtractHardLink(TarInfo *header, int extractFlag, int tostdoutFlag)
 		return( TRUE);
 
 	if (link(header->linkname, header->name) < 0) {
-		errorMsg("tar: %s: Cannot create hard link to '%s': %s\n", 
+		errorMsg("%s: Cannot create hard link to '%s': %s\n", 
 				header->name, header->linkname, strerror(errno)); 
 		return( FALSE);
 	}
@@ -406,7 +406,7 @@ tarExtractSymLink(TarInfo *header, int extractFlag, int tostdoutFlag)
 
 #ifdef	S_ISLNK
 	if (symlink(header->linkname, header->name) < 0) {
-		errorMsg("tar: %s: Cannot create symlink to '%s': %s\n", 
+		errorMsg("%s: Cannot create symlink to '%s': %s\n", 
 				header->name, header->linkname, strerror(errno)); 
 		return( FALSE);
 	}
@@ -421,7 +421,7 @@ tarExtractSymLink(TarInfo *header, int extractFlag, int tostdoutFlag)
 	/* Do not change permissions or date on symlink,
 	 * since it changes the pointed to file instead.  duh. */
 #else
-	errorMsg("tar: %s: Cannot create symlink to '%s': %s\n", 
+	errorMsg("%s: Cannot create symlink to '%s': %s\n", 
 			header->name, header->linkname, 
 			"symlinks not supported"); 
 #endif
@@ -436,13 +436,13 @@ tarExtractSpecial(TarInfo *header, int extractFlag, int tostdoutFlag)
 
 	if (S_ISCHR(header->mode) || S_ISBLK(header->mode) || S_ISSOCK(header->mode)) {
 		if (mknod(header->name, header->mode, makedev(header->devmajor, header->devminor)) < 0) {
-			errorMsg("tar: %s: Cannot mknod: %s\n",
+			errorMsg("%s: Cannot mknod: %s\n",
 				header->name, strerror(errno)); 
 			return( FALSE);
 		}
 	} else if (S_ISFIFO(header->mode)) {
 		if (mkfifo(header->name, header->mode) < 0) {
-			errorMsg("tar: %s: Cannot mkfifo: %s\n",
+			errorMsg("%s: Cannot mkfifo: %s\n",
 				header->name, strerror(errno)); 
 			return( FALSE);
 		}
@@ -490,7 +490,7 @@ readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header)
 			++*(header->name);
 
 		if (alreadyWarned == FALSE) {
-			errorMsg("tar: Removing leading '/' from member names\n");
+			errorMsg("Removing leading '/' from member names\n");
 			alreadyWarned = TRUE;
 		}
 	}
@@ -695,7 +695,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
 		return ( FALSE);
 	}
 	else if (errorFlag==TRUE) {
-		errorMsg( "tar: Error exit delayed from previous errors\n");
+		errorMsg( "Error exit delayed from previous errors\n");
 		return( FALSE);
 	} else 
 		return( status);
@@ -705,7 +705,7 @@ endgame:
 	close( tarFd);
 	if ( *(header.name) == '\0' ) {
 		if (errorFlag==TRUE)
-			errorMsg( "tar: Error exit delayed from previous errors\n");
+			errorMsg( "Error exit delayed from previous errors\n");
 		else
 			return( TRUE);
 	} 
@@ -782,7 +782,7 @@ writeTarHeader(struct TarBallInfo *tbInfo, const char *fileName, struct stat *st
 	if (*fileName=='/') {
 		static int alreadyWarned=FALSE;
 		if (alreadyWarned==FALSE) {
-			errorMsg("tar: Removing leading '/' from member names\n");
+			errorMsg("Removing leading '/' from member names\n");
 			alreadyWarned=TRUE;
 		}
 		strncpy(header.name, fileName+1, sizeof(header.name)); 
@@ -854,7 +854,7 @@ writeTarHeader(struct TarBallInfo *tbInfo, const char *fileName, struct stat *st
 		header.typeflag  = REGTYPE;
 		putOctal(header.size, sizeof(header.size), statbuf->st_size);
 	} else {
-		errorMsg("tar: %s: Unknown file type\n", fileName);
+		errorMsg("%s: Unknown file type\n", fileName);
 		return ( FALSE);
 	}
 
@@ -892,7 +892,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void*
 
 	/* It is against the rules to archive a socket */
 	if (S_ISSOCK(statbuf->st_mode)) {
-		errorMsg("tar: %s: socket ignored\n", fileName);
+		errorMsg("%s: socket ignored\n", fileName);
 		return( TRUE);
 	}
 
@@ -901,7 +901,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void*
 	 * the new tarball */
 	if (tbInfo->statBuf.st_dev == statbuf->st_dev &&
 			tbInfo->statBuf.st_ino == statbuf->st_ino) {
-		errorMsg("tar: %s: file is the archive; skipping\n", fileName);
+		errorMsg("%s: file is the archive; skipping\n", fileName);
 		return( TRUE);
 	}
 
@@ -917,7 +917,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void*
 
 		/* open the file we want to archive, and make sure all is well */
 		if ((inputFileFd = open(fileName, O_RDONLY)) < 0) {
-			errorMsg("tar: %s: Cannot open: %s\n", fileName, strerror(errno));
+			errorMsg("%s: Cannot open: %s\n", fileName, strerror(errno));
 			return( FALSE);
 		}
 		
@@ -955,7 +955,7 @@ static int writeTarFile(const char* tarName, int tostdoutFlag,
 
 	/* Make sure there is at least one file to tar up.  */
 	if (argc <= 0)
-		fatalError("tar: Cowardly refusing to create an empty archive\n");
+		fatalError("Cowardly refusing to create an empty archive\n");
 
 	/* Open the tar file for writing.  */
 	if (tostdoutFlag == TRUE)
@@ -963,7 +963,7 @@ static int writeTarFile(const char* tarName, int tostdoutFlag,
 	else
 		tbInfo.tarFd = open (tarName, O_WRONLY | O_CREAT | O_TRUNC, 0644);
 	if (tbInfo.tarFd < 0) {
-		errorMsg( "tar: Error opening '%s': %s\n", tarName, strerror(errno));
+		errorMsg( "Error opening '%s': %s\n", tarName, strerror(errno));
 		return ( FALSE);
 	}
 	tbInfo.excludeList=excludeList;
@@ -997,7 +997,7 @@ static int writeTarFile(const char* tarName, int tostdoutFlag,
 	/* Hang up the tools, close up shop, head home */
 	close(tarFd);
 	if (errorFlag == TRUE) {
-		errorMsg("tar: Error exit delayed from previous errors\n");
+		errorMsg("Error exit delayed from previous errors\n");
 		return(FALSE);
 	}
 	return( TRUE);