oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

make #ifdef positive, add comments

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-12-24 07:19:49 +01:00
parent 08d12ee6e0
commit 02e980612e
1 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
lib/hcrypto/ui.c
View File

@@ -55,7 +55,52 @@ intr(int sig)
intr_flag++; intr_flag++;
} }
#ifndef HAVE_CONIO_H #ifdef HAVE_CONIO_H
/*
* Windows does console slightly different then then unix case.
*/
static int
read_string(const char *preprompt, const char *prompt,
char *buf, size_t len, int echo)
{
int of = 0;
int c;
char *p;
void (*oldsigintr)(int);
_cprintf("%s%s", preprompt, prompt);
oldsigintr = signal(SIGINT, intr);
p = buf;
while(intr_flag == 0){
c = ((echo)? _getche(): _getch());
if(c == '\n')
break;
if(of == 0)
*p++ = c;
of = (p == buf + len);
}
if(of)
p--;
*p = 0;
if(echo == 0){
printf("\n");
}
signal(SIGINT, oldsigintr);
if(intr_flag)
return -2;
if(of)
return -1;
return 0;
}
#else /* !HAVE_CONIO_H */
#ifndef NSIG #ifndef NSIG
#define NSIG 47 #define NSIG 47
@@ -142,48 +187,7 @@ read_string(const char *preprompt, const char *prompt,
return 0; return 0;
} }
#else /* CONIO_H */ #endif /* HAVE_CONIO_H */
static int
read_string(const char *preprompt, const char *prompt,
char *buf, size_t len, int echo)
{
int of = 0;
int c;
char *p;
void (*oldsigintr)(int);
_cprintf("%s%s", preprompt, prompt);
oldsigintr = signal(SIGINT, intr);
p = buf;
while(intr_flag == 0){
c = ((echo)? _getche(): _getch());
if(c == '\n')
break;
if(of == 0)
*p++ = c;
of = (p == buf + len);
}
if(of)
p--;
*p = 0;
if(echo == 0){
printf("\n");
}
signal(SIGINT, oldsigintr);
if(intr_flag)
return -2;
if(of)
return -1;
return 0;
}
#endif
int int
UI_UTIL_read_pw_string(char *buf, int length, const char *prompt, int verify) UI_UTIL_read_pw_string(char *buf, int length, const char *prompt, int verify)