fixed default messages

This commit is contained in:
Your Name 2024-03-03 10:58:07 +03:00
parent d1f34a926f
commit 3fd33db451
5 changed files with 24 additions and 25 deletions

View File

@ -30,6 +30,7 @@ int change(const char *path, void *p) {
if (v_flag)
printf("chgrp: %s: changed group to %s\n", path, grp->gr_name);
return 0;
}
@ -55,19 +56,19 @@ int main(int argc, char **argv) {
break;
default:
printf("chgrp [group] [file1 file2...]\n\t[-H if a command line argument is a symbolic link]\n\t[-R Recursive] [-f Silent]\n\t[-v Verbose]\n");
printf("chgrp [group] [file1 file2...]\n\t[-H Symbolic link]\n\t[-R Recursive] [-f Silent]\n\t[-v Verbose]\n");
return 0;
}
}
if (argv[optind] == NULL) {
argv += optind;
argc -= optind;
if (argc == 0) {
fprintf(stderr, "chgrp: missing operand\n");
return 1;
}
argv += optind;
argc -= optind;
struct group *grp = getgrnam(argv[0]);
if (!grp) {
if (f_flag)
@ -84,7 +85,7 @@ int main(int argc, char **argv) {
}
else
change(argv[i], grp);
ret = change(argv[i], grp);
}
return ret;

View File

@ -17,11 +17,11 @@ unsigned int v_flag;
int change(const char *file, void *p) {
char *mode_arg = (char *)p;
struct stat old_file;
if (mu_get_stats(f_flag, H_flag, file, &old_file))
struct stat sb;
if (mu_get_stats(f_flag, H_flag, file, &sb))
return 1;
mode_t mode = mu_parse_mode(mode_arg, old_file.st_mode);
mode_t mode = mu_parse_mode(mode_arg, sb.st_mode);
if (chmod(file, mode) != 0) {
if (f_flag)
fprintf(stderr, "chmod: unable to chown %s: %s\n", file, strerror(errno));
@ -30,7 +30,7 @@ int change(const char *file, void *p) {
}
if (v_flag)
printf("chmod: %s: changed mode to %d\n", file, mode );
printf("chmod: %s: changed mode to %d\n", file, mode);
return 0;
}
@ -70,19 +70,19 @@ int main(int argc, char **argv) {
break;
default:
printf("chmod [ugoa]{+|-}[rwxXst] / [0 - 777] [file1 file2...]\n\t[-H If a command line argument is a symbolic link]\n\t[-R Recursive] [-f Silent]\n\t[-v Verbose]\n");
printf("chmod [ugoa]{+|-}[rwxXst] / [0 - 777] [file1 file2...]\n\t[-H Symbolic link]\n\t[-R Recursive] [-f Silent]\n\t[-v Verbose]\n");
return 0;
}
}
if (argv[optind] == NULL) {
argv += optind;
argc -= optind;
if (argc == 0) {
fprintf(stderr, "chmod: missing operand\n");
return 0;
}
argv += optind;
argc -= optind;
/* Restore arg */
if (arg)
arg[0] = '-';

View File

@ -99,19 +99,19 @@ int main(int argc, char **argv) {
break;
default:
printf("chown USER[:[GRP]] [file1 file2...]\n\t[-H If a command line argument is a symbolic link]\n\t[-R Recursive] [-f Silent]\n\t[-v Verbose]\n");
printf("chown USER[:[GRP]] [file1 file2...]\n\t[-H Symbolic link]\n\t[-R Recursive] [-f Silent]\n\t[-v Verbose]\n");
return 0;
}
}
if (argv[optind] == NULL) {
argv += optind;
argc -= optind;
if (argc == 0) {
fprintf(stderr, "chown: missing operand\n");
return 1;
}
argv += optind;
argc -= optind;
gid = -1;
uid = -1;
get_owner(argv[0]);
@ -124,7 +124,7 @@ int main(int argc, char **argv) {
}
else
change(argv[i], argv[0]);
ret = change(argv[i], argv[0]);
}
return ret;

View File

@ -169,12 +169,11 @@ int main(int argc, char **argv) {
break;
case 'r':
case 'R':
r_flag = 1;
break;
default:
printf("cp [src1 src2...] [dst]\n\t[-f Silent] [-r/-R Recursive]\n");
printf("cp [src1 src2...] [dst]\n\t[-f Silent] [-r Recursive]\n");
return 0;
}
}

View File

@ -45,12 +45,11 @@ int main(int argc, char **argv) {
break;
case 'r':
case 'R':
r_flag = 1;
break;
default:
printf("rm [file1 file2...]\n\t[-f Force] [-r/-R Recursive]\n");
printf("rm [file1 file2...]\n\t[-f Force] [-r Recursive]\n");
return 0;
}
}