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-08 19:40:47 +01:00
parent 958892932e
commit ee313c8e05
4 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cksum.c
View File

@ -22,6 +22,11 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "cksum"
#endif
/* constants */ /* constants */
static unsigned long crctab[] = static unsigned long crctab[] =
@ -108,7 +113,7 @@ static int _cksum(int argc, char * argv[])
static int _cksum_error(char * message, int ret) static int _cksum_error(char * message, int ret)
{ {
fputs("cksum: ", stderr); fputs(PROGNAME ": ", stderr);
perror(message); perror(message);
return ret; return ret;
} }
@ -159,7 +164,7 @@ static int _do_is_directory(FILE * fp)
/* usage */ /* usage */
static int _usage(void) static int _usage(void)
{ {
fputs("Usage: cksum [file...]\n", stderr); fputs("Usage: " PROGNAME " [file...]\n", stderr);
return 1; return 1;
} }

13
src/cmp.c
View File

@ -19,6 +19,11 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "cmp"
#endif
/* types */ /* types */
typedef enum _OutputType typedef enum _OutputType
@ -56,7 +61,7 @@ static int _cmp(OutputType ot, char const * file1, char const * file2)
static int _cmp_error(char const * message, int ret) static int _cmp_error(char const * message, int ret)
{ {
fputs("cmp: ", stderr); fputs(PROGNAME ": ", stderr);
perror(message); perror(message);
return ret; return ret;
} }
@ -79,8 +84,8 @@ static int _cmp_files(OutputType ot, char const * file1, char const * file2,
if(c1 == EOF || c2 == EOF) if(c1 == EOF || c2 == EOF)
{ {
if(ot != OT_NONE) if(ot != OT_NONE)
fprintf(stderr, "%s%s\n", "cmp: EOF on ", fprintf(stderr, "%s%s\n", PROGNAME ": EOF on ",
c1 == EOF ? file1 : file2); (c1 == EOF) ? file1 : file2);
ret = 1; ret = 1;
break; break;
} }
@ -113,7 +118,7 @@ static int _cmp_files(OutputType ot, char const * file1, char const * file2,
/* usage */ /* usage */
static int _usage(void) static int _usage(void)
{ {
fputs("Usage: cmp [-l|-s] file1 file2\n\ fputs("Usage: " PROGNAME " [-l|-s] file1 file2\n\
-l Write the byte number and the differing byte for each difference\n\ -l Write the byte number and the differing byte for each difference\n\
-s Write nothing for differing bytes\n", stderr); -s Write nothing for differing bytes\n", stderr);
return 2; return 2;

9
src/date.c
View File

@ -19,6 +19,11 @@
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "date"
#endif
/* date */ /* date */
/* private */ /* private */
@ -51,7 +56,7 @@ static int _date(char const * format)
/* error */ /* error */
static int _date_error(char const * message, int ret) static int _date_error(char const * message, int ret)
{ {
fputs("date: ", stderr); fputs(PROGNAME ": ", stderr);
perror(message); perror(message);
return ret; return ret;
} }
@ -60,7 +65,7 @@ static int _date_error(char const * message, int ret)
/* usage */ /* usage */
static int _usage(void) static int _usage(void)
{ {
fputs("Usage: date [+format]\n", stderr); fputs("Usage: " PROGNAME " [+format]\n", stderr);
return 1; return 1;
} }

9
src/df.c
View File

@ -23,6 +23,11 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
/* constants */
#ifndef PROGNAME
# define PROGNAME "df"
#endif
/* Prefs */ /* Prefs */
typedef int Prefs; typedef int Prefs;
@ -52,7 +57,7 @@ static int _df(Prefs * prefs, int filec, char * filev[])
static int _df_error(char const * message, int ret) static int _df_error(char const * message, int ret)
{ {
fputs("df: ", stderr); fputs(PROGNAME ": ", stderr);
perror(message); perror(message);
return ret; return ret;
} }
@ -147,7 +152,7 @@ static int _df_do(Prefs * prefs, char const * file)
/* usage */ /* usage */
static int _usage(void) static int _usage(void)
{ {
fputs("Usage: df [-k][-P][file...]\n", stderr); fputs("Usage: " PROGNAME " [-k][-P][file...]\n", stderr);
return 1; return 1;
} }