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

Use PROGNAME in more programs

Browse Source
This commit is contained in:
Pierre Pronchery 2020-12-09 15:00:42 +01:00
parent 3634f2592c
commit f7a6ab0ff9
12 changed files with 81 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/grep.c
View File

@ -22,6 +22,7 @@
#include <regex.h>
#include <errno.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "grep"
#endif

9
src/head.c
View File

@ -19,6 +19,11 @@
#include <stdlib.h>
#include <stdio.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "head"
#endif
/* head */
static int _head_error(char const * message, int ret);
@ -39,7 +44,7 @@ static int _head(int flgn, int filec, char * filev[])
static int _head_error(char const * message, int ret)
{
fputs("head: ", stderr);
fputs(PROGNAME ": ", stderr);
perror(message);
return ret;
}
@ -69,7 +74,7 @@ static int _head_do(int flgn, char const * filename)
/* usage */
static int _usage(void)
{
fputs("Usage: head [-n number][file...]\n\
fputs("Usage: " PROGNAME " [-n number][file...]\n\
-n Print first number lines on standard output\n", stderr);
return 1;
}

13
src/kill.c
View File

@ -24,6 +24,11 @@
#include <strings.h>
#include <errno.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "kill"
#endif
/* kill */
/* private */
@ -120,7 +125,7 @@ static int _kill(int sig, int argc, char * argv[])
pid = strtol(argv[i], &p, 10);
if(argv[i][0] == '\0' || *p != '\0')
{
fprintf(stderr, "%s%s%s", "kill: ", argv[i],
fprintf(stderr, "%s%s%s", PROGNAME ": ", argv[i],
": Invalid process number\n");
ret |= 1;
continue;
@ -146,7 +151,7 @@ static int _kill_list(int argc, char * argv[])
/* error */
static int _kill_error(char const * message, int ret)
{
fprintf(stderr, "%s: %s\n", "kill", message);
fprintf(stderr, "%s: %s\n", PROGNAME, message);
return ret;
}
@ -154,8 +159,8 @@ static int _kill_error(char const * message, int ret)
/* usage */
static int _usage(void)
{
fputs("Usage: kill -s signal_name pid...\n\
kill -l [exit_status]\n\
fputs("Usage: " PROGNAME " -s signal_name pid...\n\
" PROGNAME " -l [exit_status]\n\
-l Write all signal values supported\n\
-s Specify the signal to send\n", stderr);
return 1;

9
src/link.c
View File

@ -18,6 +18,11 @@
#include <unistd.h>
#include <stdio.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "link"
#endif
/* link */
static int _link_error(char const * message, int ret);
@ -31,7 +36,7 @@ static int _link(char * file1, char * file2)
static int _link_error(char const * message, int ret)
{
fputs("link: ", stderr);
fputs(PROGNAME ": ", stderr);
perror(message);
return ret;
}
@ -40,7 +45,7 @@ static int _link_error(char const * message, int ret)
/* usage */
static int _usage(void)
{
fputs("Usage: link file1 file2\n", stderr);
fputs("Usage: " PROGNAME " file1 file2\n", stderr);
return 1;
}

11
src/ln.c
View File

@ -25,6 +25,11 @@
#include <errno.h>
#include <string.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "ln"
#endif
/* types */
/* force link */
@ -62,7 +67,7 @@ static int _ln(LinkForce lf, LinkType lt, int argc, char * argv[])
static int _ln_error(char const * message, int ret)
{
fputs("ln: ", stderr);
fputs(PROGNAME ": ", stderr);
perror(message);
return ret;
}
@ -113,8 +118,8 @@ static int _ln_multiple(LinkForce lf, LinkType lt, int argc, char * argv[])
/* usage */
static int _usage(void)
{
fputs("Usage: ln [-fs] source_file target_file\n\
ln [-fs] source_file ... target_dir\n\
fputs("Usage: " PROGNAME " [-fs] source_file target_file\n\
" PROGNAME " [-fs] source_file ... target_dir\n\
-f Force existing destination pathnames to be removed\n\
-s Create symbolic links instead of hard links\n", stderr);
return 1;

9
src/locale.c
View File

@ -19,6 +19,11 @@
#include <stdlib.h>
#include <stdio.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "locale"
#endif
/* prefs */
typedef int Prefs;
@ -92,8 +97,8 @@ static int _locale_do(Prefs * p, char const * locale)
/* usage */
static int _usage(void)
{
fputs("Usage: locale [-a | -m]\n\
locale [-ck]\n", stderr);
fputs("Usage: " PROGNAME " [-a | -m]\n\
" PROGNAME " [-ck]\n", stderr);
return 1;
}

9
src/logname.c
View File

@ -18,6 +18,11 @@
#include <unistd.h>
#include <stdio.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "logname"
#endif
/* logname */
static int _logname_error(char const * message, int ret);
@ -34,7 +39,7 @@ static int _logname(void)
static int _logname_error(char const * message, int ret)
{
fputs("logname: ", stderr);
fputs(PROGNAME ": ", stderr);
perror(message);
return ret;
}
@ -43,7 +48,7 @@ static int _logname_error(char const * message, int ret)
/* usage */
static int _usage(void)
{
fputs("Usage: logname\n", stderr);
fputs("Usage: " PROGNAME "\n", stderr);
return 1;
}

9
src/mkdir.c
View File

@ -24,6 +24,11 @@
#define COMMON_MODE
#include "common.c"
/* constants */
#ifndef PROGNAME
# define PROGNAME "mkdir"
#endif
/* mkdir */
static int _mkdir_error(char const * message, int ret);
@ -47,7 +52,7 @@ static int _mkdir(int flagp, mode_t mode, int filec, char * filev[])
static int _mkdir_error(char const * message, int ret)
{
fputs("mkdir: ", stderr);
fputs(PROGNAME ": ", stderr);
perror(message);
return ret;
}
@ -81,7 +86,7 @@ static int _mkdir_p(mode_t mode, char * pathname)
/* usage */
static int _usage(void)
{
fputs("Usage: mkdir [-p][-m mode] dir...\n\
fputs("Usage: " PROGNAME " [-p][-m mode] dir...\n\
-p Create any missing intermediate pathname components\n\
-m File permission bits of the newly-created directory\n", stderr);
return 1;

9
src/mkfifo.c
View File

@ -24,6 +24,11 @@
#define COMMON_MODE
#include "common.c"
/* constants */
#ifndef PROGNAME
# define PROGNAME "mkfifo"
#endif
/* mkfifo */
static int _mkfifo_error(char const * message, int ret);
@ -41,7 +46,7 @@ static int _mkfifo(mode_t mode, int filec, char * filev[])
static int _mkfifo_error(char const * message, int ret)
{
fputs("mkfifo: ", stderr);
fputs(PROGNAME ": ", stderr);
perror(message);
return ret;
}
@ -50,7 +55,7 @@ static int _mkfifo_error(char const * message, int ret)
/* usage */
static int _usage(void)
{
fputs("Usage: mkfifo [-m mode] file...\n\
fputs("Usage: " PROGNAME " [-m mode] file...\n\
-m Create fifo with the specified mode value\n", stderr);
return 1;
}

9
src/more.c
View File

@ -21,6 +21,11 @@
#include <string.h>
#include <limits.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "more"
#endif
/* more */
/* private */
@ -86,7 +91,7 @@ static int _more_do(Prefs * prefs, char const * filename)
/* more_error */
static int _more_error(char const * message, int ret)
{
fputs("more: ", stderr);
fputs(PROGNAME ": ", stderr);
perror(message);
return ret;
}
@ -95,7 +100,7 @@ static int _more_error(char const * message, int ret)
/* usage */
static int _usage(void)
{
fputs("Usage: more [file...]\n", stderr);
fputs("Usage: " PROGNAME " [file...]\n", stderr);
return 1;
}

9
src/nice.c
View File

@ -21,6 +21,11 @@
#include <stdlib.h>
#include <stdio.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "nice"
#endif
/* nice */
static int _nice_error(char const * message, int ret);
@ -35,7 +40,7 @@ static int _nice(int nice, char * argv[])
static int _nice_error(char const * message, int ret)
{
fputs("nice: ", stderr);
fputs(PROGNAME ": ", stderr);
perror(message);
return ret;
}
@ -44,7 +49,7 @@ static int _nice_error(char const * message, int ret)
/* usage */
static int _usage(void)
{
fputs("Usage: nice [-n increment] utility [argument...]\n\
fputs("Usage: " PROGNAME " [-n increment] utility [argument...]\n\
-n Priority to set\n", stderr);
return 1;
}

9
src/pr.c
View File

@ -22,6 +22,11 @@
#include <string.h>
#include <time.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "pr"
#endif
/* pr */
/* types */
@ -71,7 +76,7 @@ static int _pr(Prefs * prefs, int filec, char * filev[])
static int _pr_error(char const * message, int ret)
{
fputs("pr: ", stderr);
fputs(PROGNAME ": ", stderr);
perror(message);
return ret;
}
@ -196,7 +201,7 @@ static void _do_footer(Prefs * prefs)
/* usage */
static int _usage(void)
{
fputs("Usage: pr [+page][-column][-adFmrt][-e [char][ gap]]"
fputs("Usage: " PROGNAME " [+page][-column][-adFmrt][-e [char][ gap]]"
"[-h header][-i[char][gap]]\n"
"[-l lines][-n [char][width]][-o offset][-s[char]]"
"[-w width] file...\n",