all (but `yes`): use printf formatting

clang no longer complains!
master
Drake 3 years ago
parent 09e94c66ee
commit 01f7d53d15
No known key found for this signature in database
GPG Key ID: 9B83455BD94F12A3

@ -18,7 +18,7 @@ int main(int argc, char** argv) {
if (argc == 1) {
struct utsname e;
uname(&e);
printf(e.machine);
printf("%s", e.machine);
return 0;
} else {
for (int i = 0; i < argc; i++) {

@ -48,5 +48,5 @@ int main(int argc, char** argv) {
}
}
wd = basename(upname);
printf(wd);
printf("%s", wd);
}

@ -134,7 +134,7 @@ int main(int argc, char** argv) {
int currLen = 0;
for (i = 0; i < n; i++) {
if (colour == false) {
printf(words[i]);
printf("%s", words[i]);
} else {
strcpy(wd, oldwd);
strcat(wd, "/");
@ -142,10 +142,10 @@ int main(int argc, char** argv) {
//printf(wd);
if (isRegularFile(wd) == false) {
printf(ANSI_BLUE);
printf(words[i]);
printf("%s", words[i]);
printf(ANSI_RESET);
} else {
printf(words[i]);
printf("%s", words[i]);
}
}
printf(" ");

@ -18,7 +18,7 @@ int main(int argc, char** argv) {
char wd[PATH_MAX];
getcwd(wd, sizeof(wd));
if (argc == 1) {
printf(wd);
printf("%s", wd);
} else {
for (int i = 0; i < argc; i++) {
char* arg = argv[i];

@ -30,12 +30,12 @@ int main(int argc, char** argv) {
struct utsname uts;
uname(&uts);
if (argc == 1) {
printf("%s\n", uts.sysname);
printf("%s", uts.sysname);
} else {
for (int i = 1; i < argc; i++) {
char *arg = argv[i];
/*printf(arg);
printf(" ");*/
*/
if (!strcmp(arg, "--help")) {
char* help =
"Drake's Epic Coreutils (working title) "
@ -64,33 +64,24 @@ int main(int argc, char** argv) {
} else if (!strcmp(arg, "--hostname")) {
char hostname[HOST_NAME_MAX + 1];
gethostname(hostname, HOST_NAME_MAX + 1);
printf(hostname);
printf(" ");
printf("%s ", hostname);
} else if (!strcmp(arg, "--sysinfo")) {
printf(uts.sysname);
printf(" ");
printf("%s ", uts.sysname);
} else if (!strcmp(arg, "--krelease")) {
printf(uts.release);
printf(" ");
printf("%s ", uts.release);
} else if (!strcmp(arg, "--kversion")) {
printf(uts.version);
printf(" ");
printf("%s ", uts.version);
} else if (!strcmp(arg, "--arch")) {
printf(uts.machine);
printf(" ");
printf("%s ", uts.machine);
} else if (!strcmp(arg, "--all")) {
//equivalent to -shrvm
printf(uts.sysname);
printf(" ");
printf("%s ", uts.sysname);
char hostname[HOST_NAME_MAX + 1];
gethostname(hostname, HOST_NAME_MAX + 1);
printf(hostname);
printf(" ");
printf(uts.release);
printf(" ");
printf(uts.version);
printf(" ");
printf(uts.machine);
printf("%s ", hostname);
printf("%s ", uts.release);
printf("%s ", uts.version);
printf("%s ", uts.machine);
} else if (startsWithChar(arg, '-')) {
char info;
for (int n = 1; n < strlen(arg); n++) {
@ -100,36 +91,30 @@ int main(int argc, char** argv) {
if (info == 'h') {
char hostname[HOST_NAME_MAX + 1];
gethostname(hostname, HOST_NAME_MAX + 1);
printf(hostname);
printf("%s ", hostname);
}
if (info == 's') {
printf(uts.sysname);
printf("%s ", uts.sysname);
}
if (info == 'r') {
printf(uts.release);
printf("%s ", uts.release);
}
if (info == 'v') {
printf(uts.version);
printf("%s ", uts.version);
}
if (info == 'm') {
printf(uts.machine);
printf("%s ", uts.machine);
}
if (info == 'a') {
//equivalent to -shrvm
printf(uts.sysname);
printf(" ");
printf("%s ", uts.sysname);
char hostname[HOST_NAME_MAX + 1];
gethostname(hostname, HOST_NAME_MAX + 1);
printf(hostname);
printf(" ");
printf(uts.release);
printf(" ");
printf(uts.version);
printf(" ");
printf(uts.machine);
printf("%s ", hostname);
printf("%s ", uts.release);
printf("%s ", uts.version);
printf("%s ", uts.machine);
}
printf(" ");
}
}
}

@ -17,7 +17,7 @@ Available arguments:
int main(int argc, char** argv) {
char * username = getlogin(); //a fucking ai came up with this. a fucking ai. A FUCKING AI
if (argc == 1) {
printf(username);
printf("%s", username);
return 0;
} else {
for (int i = 0; i < argc; i++) {

Loading…
Cancel
Save