d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clarify code:

Browse Source 
add comments.
don't get the length of each arg passed, only the last one.
check against == or != NULL rather than using a pointer value as
truth test.
This commit is contained in:
Alfred Perlstein 2002-03-04 05:30:04 +00:00
parent 5573db3f0b
commit 6188858ae1
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bin/echo/echo.c
View File

@ -53,7 +53,7 @@ static const char rcsid[] =
int int
main(int argc __unused, char *argv[]) main(int argc __unused, char *argv[])
{ {
int nflag; int nflag; /* if not set, output a trailing newline. */
/* This utility may NOT do getopt(3) option parsing. */ /* This utility may NOT do getopt(3) option parsing. */
if (*++argv && !strcmp(*argv, "-n")) { if (*++argv && !strcmp(*argv, "-n")) {
@ -63,12 +63,25 @@ main(int argc __unused, char *argv[])
else else
nflag = 0; nflag = 0;
while (argv[0]) { while (argv[0] != NULL) {
size_t len = strlen(argv[0]);
if (len >= 2 && !argv[1] && argv[0][len - 2] == '\\' && argv[0][len - 1] == 'c') { /*
argv[0][len - 2] = '\0'; * If the next argument is NULL then this is this
nflag = 1; * the last argument, therefore we need to check
* for a trailing \c.
*/
if (argv[1] == NULL) {
size_t len;
len = strlen(argv[0]);
/* is there room for a '\c' and is there one? */
if (len >= 2 &&
argv[0][len - 2] == '\\' &&
argv[0][len - 1] == 'c') {
/* chop it and set the no-newline flag. */
argv[0][len - 2] = '\0';
nflag = 1;
}
} }
(void)printf("%s", argv[0]); (void)printf("%s", argv[0]);
if (*++argv) if (*++argv)