if (size >= alloc) {
alloc += 8192;
if (alloc > max) {
- reply_with_error ("cat: %s: file is too large for message buffer",
- path);
- free (buf);
- close (fd);
- return NULL;
+ reply_with_error ("cat: %s: file is too large for message buffer",
+ path);
+ free (buf);
+ close (fd);
+ return NULL;
}
buf2 = realloc (buf, alloc);
if (buf2 == NULL) {
- reply_with_perror ("realloc");
- free (buf);
- close (fd);
- return NULL;
+ reply_with_perror ("realloc");
+ free (buf);
+ close (fd);
+ return NULL;
}
buf = buf2;
}
int len;
NEED_ROOT_OR_IS_DEVICE (path, NULL);
- ABS_PATH (path, NULL);
if (strncmp (path, "/dev/", 5) == 0)
buf = (char *) path;
return NULL;
}
- r = command (&out, &err, "file", "-bsL", buf, NULL);
+ r = command (&out, &err, "file", "-zbsL", buf, NULL);
if (freeit) free (buf);
if (r == -1) {
do_zfile (char *method, char *path)
{
int len;
+ const char *zcat;
char *cmd;
FILE *fp;
char line[256];
NEED_ROOT (NULL);
ABS_PATH (path, NULL);
- len = 2 * strlen (path) + sysroot_len + 64;
- cmd = malloc (len);
- if (!cmd) {
- reply_with_perror ("malloc");
- return NULL;
- }
-
if (strcmp (method, "gzip") == 0 || strcmp (method, "compress") == 0)
- strcpy (cmd, "zcat");
+ zcat = "zcat";
else if (strcmp (method, "bzip2") == 0)
- strcpy (cmd, "bzcat");
+ zcat = "bzcat";
else {
- free (cmd);
reply_with_error ("zfile: unknown method");
return NULL;
}
- strcat (cmd, " ");
- strcat (cmd, sysroot);
- shell_quote (cmd + strlen (cmd), len - strlen (cmd), path);
- strcat (cmd, " | file -bsL -");
+ if (asprintf_nowarn (&cmd, "%s %R | file -bsL -", zcat, path) == -1) {
+ reply_with_perror ("asprintf");
+ return NULL;
+ }
+
+ if (verbose)
+ fprintf (stderr, "%s\n", cmd);
fp = popen (cmd, "r");
if (fp == NULL) {