Sort includes and more cleanup and fixes in util/
This commit is contained in:
@@ -3,8 +3,8 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "../util.h"
|
||||
|
||||
@@ -17,7 +17,7 @@ enmasse(int argc, char *argv[], int (*fn)(const char *, const char *))
|
||||
struct stat st;
|
||||
size_t dlen;
|
||||
|
||||
if(argc == 2 && !(stat(argv[1], &st) == 0 && S_ISDIR(st.st_mode))) {
|
||||
if (argc == 2 && !(stat(argv[1], &st) == 0 && S_ISDIR(st.st_mode))) {
|
||||
fnck(argv[0], argv[1], fn);
|
||||
return;
|
||||
} else {
|
||||
@@ -25,13 +25,13 @@ enmasse(int argc, char *argv[], int (*fn)(const char *, const char *))
|
||||
}
|
||||
|
||||
apathmax(&buf, &size);
|
||||
for(i = 0; i < argc; i++) {
|
||||
for (i = 0; i < argc; i++) {
|
||||
dlen = strlen(dir);
|
||||
if(dlen > 0 && dir[dlen - 1] == '/')
|
||||
if (dlen > 0 && dir[dlen - 1] == '/')
|
||||
len = snprintf(buf, size, "%s%s", dir, basename(argv[i]));
|
||||
else
|
||||
len = snprintf(buf, size, "%s/%s", dir, basename(argv[i]));
|
||||
if(len < 0 || len >= size) {
|
||||
if (len < 0 || len >= size) {
|
||||
eprintf("%s/%s: filename too long\n", dir,
|
||||
basename(argv[i]));
|
||||
}
|
||||
|
Reference in New Issue
Block a user