diff options
| author | raf <none@none> | 2008-06-06 14:02:15 -0700 |
|---|---|---|
| committer | raf <none@none> | 2008-06-06 14:02:15 -0700 |
| commit | 7257d1b4d25bfac0c802847390e98a464fd787ac (patch) | |
| tree | c73fc17df920bc2ca9438c25fea3529890296afd /usr/src/lib/libsocket/inet/ruserpass.c | |
| parent | 455903679f53d12d92035adc60bc7c3d95e6b6a2 (diff) | |
| download | illumos-joyent-7257d1b4d25bfac0c802847390e98a464fd787ac.tar.gz | |
PSARC 2008/309 expunge synonyms.h
6700179 expunge synonyms.h
--HG--
rename : usr/src/cmd/sgs/libelf/common/syn.h => deleted_files/usr/src/cmd/sgs/libelf/common/syn.h
rename : usr/src/cmd/sgs/librtld/common/lintsup.c => deleted_files/usr/src/cmd/sgs/librtld/common/lintsup.c
rename : usr/src/cmd/sgs/rtld/common/_synonyms.h => deleted_files/usr/src/cmd/sgs/rtld/common/_synonyms.h
rename : usr/src/common/atomic/atomic_asm_weak.h => deleted_files/usr/src/common/atomic/atomic_asm_weak.h
rename : usr/src/lib/common/inc/c_synonyms.h => deleted_files/usr/src/lib/common/inc/c_synonyms.h
rename : usr/src/lib/libc/amd64/gen/lexp10.c => deleted_files/usr/src/lib/libc/amd64/gen/lexp10.c
rename : usr/src/lib/libc/amd64/gen/llog10.c => deleted_files/usr/src/lib/libc/amd64/gen/llog10.c
rename : usr/src/lib/libc/amd64/gen/ltostr.c => deleted_files/usr/src/lib/libc/amd64/gen/ltostr.c
rename : usr/src/lib/libc/i386/gen/lexp10.c => deleted_files/usr/src/lib/libc/i386/gen/lexp10.c
rename : usr/src/lib/libc/i386/gen/llog10.c => deleted_files/usr/src/lib/libc/i386/gen/llog10.c
rename : usr/src/lib/libc/i386/gen/ltostr.c => deleted_files/usr/src/lib/libc/i386/gen/ltostr.c
rename : usr/src/lib/libc/inc/synonyms.h => deleted_files/usr/src/lib/libc/inc/synonyms.h
rename : usr/src/lib/libc/sparcv9/gen/lexp10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/lexp10.c
rename : usr/src/lib/libc/sparcv9/gen/llog10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/llog10.c
rename : usr/src/lib/libc_psr/inc.flg => deleted_files/usr/src/lib/libc_psr/inc.flg
rename : usr/src/lib/libcrypt/inc/des_synonyms.h => deleted_files/usr/src/lib/libcrypt/inc/des_synonyms.h
rename : usr/src/lib/libgen/inc/gen_synonyms.h => deleted_files/usr/src/lib/libgen/inc/gen_synonyms.h
rename : usr/src/lib/libtsnet/common/synonyms.h => deleted_files/usr/src/lib/libtsnet/common/synonyms.h
rename : usr/src/tools/scripts/check_fnames.sh => deleted_files/usr/src/tools/scripts/check_fnames.sh
rename : usr/src/lib/libc/sparc/gen/lexp10.c => usr/src/lib/libc/port/gen/lexp10.c
rename : usr/src/lib/libc/sparc/gen/llog10.c => usr/src/lib/libc/port/gen/llog10.c
Diffstat (limited to 'usr/src/lib/libsocket/inet/ruserpass.c')
| -rw-r--r-- | usr/src/lib/libsocket/inet/ruserpass.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/usr/src/lib/libsocket/inet/ruserpass.c b/usr/src/lib/libsocket/inet/ruserpass.c index 4d9780f2af..17d59439a9 100644 --- a/usr/src/lib/libsocket/inet/ruserpass.c +++ b/usr/src/lib/libsocket/inet/ruserpass.c @@ -18,8 +18,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -48,8 +49,6 @@ #include <stdlib.h> #include <libintl.h> -extern char *_dgettext(); - #ifdef SYSV #define index strchr #endif /* SYSV */ @@ -126,7 +125,7 @@ _ruserpass(const char *host, char **aname, char **apass) *aname = malloc(MAXANAME + 1); (void) cuserid(myname); - (void) printf(_dgettext(TEXT_DOMAIN, "Name (%s:%s): "), + (void) printf(dgettext(TEXT_DOMAIN, "Name (%s:%s): "), host, myname); (void) fflush(stdout); if (read(2, *aname, MAXANAME) <= 0) @@ -139,8 +138,8 @@ _ruserpass(const char *host, char **aname, char **apass) *index(*aname, '\n') = 0; } if (*aname && *apass == 0) { - (void) printf(_dgettext(TEXT_DOMAIN, "Password (%s:%s): "), - host, *aname); + (void) printf(dgettext(TEXT_DOMAIN, "Password (%s:%s): "), + host, *aname); (void) fflush(stdout); *apass = getpass(""); } @@ -194,12 +193,12 @@ next: break; case PASSWD: if (fstat64(fileno(d->cfile), &stb) >= 0 && - (stb.st_mode & 077) != 0) { + (stb.st_mode & 077) != 0) { (void) fprintf(stderr, - _dgettext(TEXT_DOMAIN, + dgettext(TEXT_DOMAIN, "Error - .netrc file not correct mode.\n")); (void) fprintf(stderr, - _dgettext(TEXT_DOMAIN, + dgettext(TEXT_DOMAIN, "Remove password or correct mode.\n")); exit(1); } @@ -215,7 +214,7 @@ next: (void) token(); break; default: - (void) fprintf(stderr, _dgettext(TEXT_DOMAIN, + (void) fprintf(stderr, dgettext(TEXT_DOMAIN, "Unknown .netrc option %s\n"), d->tokval); break; } @@ -253,7 +252,7 @@ token() } else { *cp++ = (char)c; while ((c = getc(d->cfile)) != EOF && - c != '\n' && c != '\t' && c != ' ' && c != ',') { + c != '\n' && c != '\t' && c != ' ' && c != ',') { if (c == '\\') c = getc(d->cfile); *cp++ = (char)c; |
