DeforaOS/utils
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2009-10-20 14:53:44 +00:00
parent 06c14936c3
commit 5594455536
6 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mkdir.c
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2007 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Unix utils */ /* This file is part of DeforaOS Unix utils */
/* utils is not free software; you can redistribute it and/or modify it under /* utils is not free software; you can redistribute it and/or modify it under
* the terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 * the terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0
@ -27,27 +27,26 @@
/* mkdir */ /* mkdir */
static int _mkdir_error(char * message, int ret); static int _mkdir_error(char const * message, int ret);
static int _mkdir_p(mode_t mode, char * pathname); static int _mkdir_p(mode_t mode, char * pathname);
static int _mkdir(int flagp, mode_t mode, int argc, char * argv[])
static int _mkdir(int flagp, mode_t mode, int filec, char * filev[])
{ {
int res = 0; int ret = 0;
int i; int i;
for(i = 0; i < argc; i++) for(i = 0; i < filec; i++)
{
if(flagp == 1) if(flagp == 1)
{ {
if(_mkdir_p(mode, argv[i]) != 0) if(_mkdir_p(mode, filev[i]) != 0)
res = 2; ret = 2;
} }
else if(mkdir(argv[i], mode) != 0) else if(mkdir(filev[i], mode) != 0)
res = _mkdir_error(argv[i], 2); ret = _mkdir_error(filev[i], 2);
} return ret;
return res;
} }
static int _mkdir_error(char * message, int ret) static int _mkdir_error(char const * message, int ret)
{ {
fputs("mkdir: ", stderr); fputs("mkdir: ", stderr);
perror(message); perror(message);

17
src/mkfifo.c
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2007 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Unix utils */ /* This file is part of DeforaOS Unix utils */
/* utils is not free software; you can redistribute it and/or modify it under /* utils is not free software; you can redistribute it and/or modify it under
* the terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 * the terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0
@ -27,19 +27,20 @@
/* mkfifo */ /* mkfifo */
static int _mkfifo_error(char * message, int ret); static int _mkfifo_error(char const * message, int ret);
static int _mkfifo(mode_t mode, int argc, char * argv[])
static int _mkfifo(mode_t mode, int filec, char * filev[])
{ {
int ret = 0; int ret = 0;
int i; int i;
for(i = 0; i < argc; i++) for(i = 0; i < filec; i++)
if(mkfifo(argv[i], mode) == -1) if(mkfifo(filev[i], mode) == -1)
ret+=_mkfifo_error(argv[i], 1); ret |= _mkfifo_error(filev[i], 1);
return ret; return ret;
} }
static int _mkfifo_error(char * message, int ret) static int _mkfifo_error(char const * message, int ret)
{ {
fputs("mkfifo: ", stderr); fputs("mkfifo: ", stderr);
perror(message); perror(message);
@ -74,5 +75,5 @@ int main(int argc, char * argv[])
} }
if(argc == optind) if(argc == optind)
return _usage(); return _usage();
return _mkfifo(mode, argc - optind, &argv[optind]) == 0 ? 0 : 2; return (_mkfifo(mode, argc - optind, &argv[optind]) == 0) ? 0 : 2;
} }

13
src/nice.c
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2007 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Unix utils */ /* This file is part of DeforaOS Unix utils */
/* utils is not free software; you can redistribute it and/or modify it under /* utils is not free software; you can redistribute it and/or modify it under
* the terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 * the terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0
@ -24,16 +24,17 @@
/* nice */ /* nice */
static int _nice_error(char * message, int ret); static int _nice_error(char const * message, int ret);
static int _nice(int nice, char * argv[]) static int _nice(int nice, char * argv[])
{ {
if(setpriority(PRIO_PROCESS, 0, nice) != 0) if(setpriority(PRIO_PROCESS, 0, nice) != 0)
return _nice_error("Unable to set priority", 2); return _nice_error("Unable to set priority", 1);
execvp(argv[0], argv); execvp(argv[0], argv);
return _nice_error(argv[0], 2); return _nice_error(argv[0], 1);
} }
static int _nice_error(char * message, int ret) static int _nice_error(char const * message, int ret)
{ {
fputs("nice: ", stderr); fputs("nice: ", stderr);
perror(message); perror(message);
@ -70,5 +71,5 @@ int main(int argc, char * argv[])
} }
if(argc - optind < 1) if(argc - optind < 1)
return _usage(); return _usage();
return _nice(nice, &argv[optind]); return (_nice(nice, &argv[optind]) == 0) ? 0 : 2;
} }

12
src/printf.c
View File

@ -24,7 +24,7 @@
/* printf */ /* printf */
static int _printf_error(char const * message, int ret); static int _printf_error(char const * message, int ret);
static int _printf_unescape(char const ** p); static int _printf_unescape(char const * p);
static int _printf_format(char const ** p, char const * arg); static int _printf_format(char const ** p, char const * arg);
static int _printf(char const * format, int argc, char * argv[]) static int _printf(char const * format, int argc, char * argv[])
@ -41,7 +41,7 @@ static int _printf(char const * format, int argc, char * argv[])
if(*p == '\\') if(*p == '\\')
{ {
p++; p++;
if(_printf_unescape(&p) != 0) if(_printf_unescape(p) != 0)
break; break;
if(*p == '\0') if(*p == '\0')
break; break;
@ -82,9 +82,9 @@ static int _printf_error(char const * message, int ret)
return ret; return ret;
} }
static int _printf_unescape(char const ** p) static int _printf_unescape(char const * p)
{ {
switch(**p) switch(*p)
{ {
case '\0': case '\0':
break; break;
@ -124,9 +124,9 @@ static int _printf_unescape(char const ** p)
case '9': case '9':
case 'x': /* FIXME implement */ case 'x': /* FIXME implement */
errno = ENOSYS; errno = ENOSYS;
return _printf_error(*p, 1); return _printf_error(p, 1);
default: default:
putc(**p, stdout); putc(*p, stdout);
break; break;
} }
return 0; return 0;

13
src/renice.c
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2007 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Unix utils */ /* This file is part of DeforaOS Unix utils */
/* utils is not free software; you can redistribute it and/or modify it under /* utils is not free software; you can redistribute it and/or modify it under
* the terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 * the terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0
@ -24,7 +24,8 @@
/* renice */ /* renice */
static int _renice_error(char * message, int ret); static int _renice_error(char const * message, int ret);
static int _renice(int nice, int type, int argc, char * argv[]) static int _renice(int nice, int type, int argc, char * argv[])
{ {
int i; int i;
@ -39,16 +40,16 @@ static int _renice(int nice, int type, int argc, char * argv[])
{ {
fprintf(stderr, "%s%s%s", "renice: ", argv[i], fprintf(stderr, "%s%s%s", "renice: ", argv[i],
"Invalid ID\n"); "Invalid ID\n");
ret = 2; ret |= 1;
continue; continue;
} }
if(setpriority(type, id, nice) != 0) if(setpriority(type, id, nice) != 0)
ret = _renice_error(argv[i], 2); ret |= _renice_error(argv[i], 1);
} }
return ret; return ret;
} }
static int _renice_error(char * message, int ret) static int _renice_error(char const * message, int ret)
{ {
fputs("renice: ", stderr); fputs("renice: ", stderr);
perror(message); perror(message);
@ -98,5 +99,5 @@ int main(int argc, char * argv[])
} }
if(argc - optind < 1) if(argc - optind < 1)
return _usage(); return _usage();
return _renice(nice, type, argc - optind, &argv[optind]); return (_renice(nice, type, argc - optind, &argv[optind]) == 0) ? 0 : 2;
} }

23
src/rmdir.c
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2007 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Unix utils */ /* This file is part of DeforaOS Unix utils */
/* utils is not free software; you can redistribute it and/or modify it under /* utils is not free software; you can redistribute it and/or modify it under
* the terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 * the terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0
@ -21,24 +21,25 @@
/* rmdir */ /* rmdir */
static int _rmdir_error(char * message, int ret); static int _rmdir_error(char const * message, int ret);
static int _rmdir_p(char * pathname); static int _rmdir_p(char * pathname);
static int _rmdir(int flagp, int argc, char * argv[]) static int _rmdir(int flagp, int filec, char * filev[])
{ {
int ret = 0; int ret = 0;
int i; int i;
for(i = 0; i < argc; i++) for(i = 0; i < filec; i++)
{ {
if(rmdir(argv[i]) != 0) if(rmdir(filev[i]) != 0)
ret = _rmdir_error(argv[i], 2); ret |= _rmdir_error(filev[i], 1);
if(flagp && _rmdir_p(argv[i]) != 0) if(flagp && _rmdir_p(filev[i]) != 0)
ret = 2; ret |= 1;
} }
return ret; return ret;
} }
static int _rmdir_error(char * message, int ret) static int _rmdir_error(char const * message, int ret)
{ {
fputs("rmdir: ", stderr); fputs("rmdir: ", stderr);
perror(message); perror(message);
@ -59,7 +60,7 @@ static int _rmdir_p(char * pathname)
if(*str == '\0') if(*str == '\0')
return 0; return 0;
if(rmdir(pathname) == -1) if(rmdir(pathname) == -1)
return _rmdir_error(pathname, 2); return _rmdir_error(pathname, 1);
} }
return 0; return 0;
} }
@ -91,5 +92,5 @@ int main(int argc, char * argv[])
} }
if(optind == argc) if(optind == argc)
return _usage(); return _usage();
return _rmdir(flagp, argc - optind, &argv[optind]); return (_rmdir(flagp, argc - optind, &argv[optind]) == 0) ? 0 : 2;
} }