nik/whois
1
0
Fork 0
mirror of https://github.com/rfc1036/whois.git synced 2026-05-03 06:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkpasswd: support passwords of arbitrary length

Browse Source 
Closes: #899254
This commit is contained in:
Marco d'Itri 2018-05-22 05:04:54 +02:00
parent 42f6fab4cf
commit fdd5a596b0
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
mkpasswd.c
View File

@ -127,6 +127,7 @@ void *get_random_bytes(const unsigned int len);
void NORETURN display_help(int error); void NORETURN display_help(int error);
void display_version(void); void display_version(void);
void display_methods(void); void display_methods(void);
char *read_line(FILE *fp);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -314,24 +315,20 @@ int main(int argc, char *argv[])
if (password) { if (password) {
} else if (password_fd != -1) { } else if (password_fd != -1) {
FILE *fp; FILE *fp;
char *p;
if (isatty(password_fd)) if (isatty(password_fd))
fprintf(stderr, _("Password: ")); fprintf(stderr, _("Password: "));
password = NOFAIL(malloc(128));
fp = fdopen(password_fd, "r"); fp = fdopen(password_fd, "r");
if (!fp) { if (!fp) {
perror("fdopen"); perror("fdopen");
exit(2); exit(2);
} }
if (!fgets(password, 128, fp)) {
perror("fgets"); password = read_line(fp);
if (!password) {
perror("fgetc");
exit(2); exit(2);
} }
p = strpbrk(password, "\n\r");
if (p)
*p = '\0';
} else { } else {
password = getpass(_("Password: ")); password = getpass(_("Password: "));
if (!password) { if (!password) {
@ -479,3 +476,29 @@ void display_methods(void)
printf("%s\t%s\n", methods[i].method, methods[i].desc); printf("%s\t%s\n", methods[i].method, methods[i].desc);
} }
char *read_line(FILE *fp) {
int size = 128;
int ch;
size_t pos = 0;
char *password;
password = NOFAIL(malloc(size));
while ((ch = fgetc(fp)) != EOF) {
if (ch == '\n' || ch == '\r')
break;
password[pos++] = ch;
if (pos == size) {
size += 128;
password = NOFAIL(realloc(password, size));
}
}
password[pos] = '\0';
if (ferror(fp)) {
free(password);
return NULL;
}
return password;
}