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

do something to handle C-c in prompts

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10477 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2001-08-10 14:25:32 +00:00
parent a93ed20331
commit c80e917ff9
1 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
kadmin/util.c
View File

@@ -41,6 +41,9 @@ RCSID("$Id$");
* types of data used in kadmin.
*/
static int
get_response(const char *prompt, const char *def, char *buf, size_t len);
/*
* attributes
*/
@@ -130,7 +133,8 @@ edit_attributes (const char *prompt, krb5_flags *attr, int *mask, int bit)
attributes2str(*attr, buf, sizeof(buf));
for (;;) {
get_response("Attributes", buf, resp, sizeof(resp));
if(get_response("Attributes", buf, resp, sizeof(resp)) != 0)
return 1;
if (resp[0] == '\0')
break;
if (parse_attributes (resp, attr, mask, bit) == 0)
@@ -231,7 +235,7 @@ parse_timet (const char *resp, krb5_timestamp *value, int *mask, int bit)
* allow the user to edit the time in `value'
*/
int
static int
edit_timet (const char *prompt, krb5_timestamp *value, int *mask, int bit)
{
char buf[1024], resp[1024];
@@ -242,7 +246,8 @@ edit_timet (const char *prompt, krb5_timestamp *value, int *mask, int bit)
time_t2str (*value, buf, sizeof (buf), 0);
for (;;) {
get_response(prompt, buf, resp, sizeof(resp));
if(get_response(prompt, buf, resp, sizeof(resp)) != 0)
return 1;
if (parse_timet (resp, value, mask, bit) == 0)
break;
}
@@ -327,7 +332,8 @@ edit_deltat (const char *prompt, krb5_deltat *value, int *mask, int bit)
deltat2str(*value, buf, sizeof(buf));
for (;;) {
get_response(prompt, buf, resp, sizeof(resp));
if(get_response(prompt, buf, resp, sizeof(resp)) != 0)
return 1;
if (parse_deltat (resp, value, mask, bit) == 0)
break;
}
@@ -366,7 +372,6 @@ set_defaults(kadm5_principal_ent_t ent, int *mask,
&& (default_mask & KADM5_ATTRIBUTES)
&& !(*mask & KADM5_ATTRIBUTES))
ent->attributes = default_ent->attributes & ~KRB5_KDB_DISALLOW_ALL_TIX;
return 0;
}
int
@@ -376,20 +381,26 @@ edit_entry(kadm5_principal_ent_t ent, int *mask,
set_defaults(ent, mask, default_ent, default_mask);
edit_deltat ("Max ticket life", &ent->max_life, mask,
KADM5_MAX_LIFE);
if(edit_deltat ("Max ticket life", &ent->max_life, mask,
KADM5_MAX_LIFE) != 0)
return 1;
if(edit_deltat ("Max renewable life", &ent->max_renewable_life, mask,
KADM5_MAX_RLIFE) != 0)
return 1;
edit_deltat ("Max renewable life", &ent->max_renewable_life, mask,
KADM5_MAX_RLIFE);
if(edit_timet ("Principal expiration time", &ent->princ_expire_time, mask,
KADM5_PRINC_EXPIRE_TIME) != 0)
return 1;
edit_timet ("Principal expiration time", &ent->princ_expire_time, mask,
KADM5_PRINC_EXPIRE_TIME);
if(edit_timet ("Password expiration time", &ent->pw_expiration, mask,
KADM5_PW_EXPIRATION) != 0)
return 1;
edit_timet ("Password expiration time", &ent->pw_expiration, mask,
KADM5_PW_EXPIRATION);
if(edit_attributes ("Attributes", &ent->attributes, mask,
KADM5_ATTRIBUTES) != 0)
return 1;
edit_attributes ("Attributes", &ent->attributes, mask,
KADM5_ATTRIBUTES);
return 0;
}
@@ -526,20 +537,45 @@ foreach_principal(const char *exp,
* in `buf, len'
*/
void
#include <setjmp.h>
static sig_atomic_t num_intrs;
static jmp_buf jmpbuf;
static void
interrupt(int sig)
{
longjmp(jmpbuf, 1);
}
static int
get_response(const char *prompt, const char *def, char *buf, size_t len)
{
char *p;
void (*osig)(int);
num_intrs = 0;
osig = signal(SIGINT, interrupt);
if(setjmp(jmpbuf)) {
signal(SIGINT, osig);
return 1;
}
printf("%s [%s]:", prompt, def);
if(fgets(buf, len, stdin) == NULL)
*buf = '\0';
if(fgets(buf, len, stdin) == NULL) {
int save_errno = errno;
if(ferror(stdin))
krb5_err(context, save_errno, "<stdin>");
signal(SIGINT, osig);
return 1;
}
p = strchr(buf, '\n');
if(p)
*p = '\0';
if(strcmp(buf, "") == 0)
strncpy(buf, def, len);
buf[len-1] = 0;
strlcpy(buf, def, len);
signal(SIGINT, osig);
return 0;
}
/*