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

Use strsep

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2595 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-07-24 07:38:59 +00:00
parent d12dca0f40
commit 4af7f453d2
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
admin/load.c
View File

@@ -99,15 +99,15 @@ parse_integer(unsigned *u, char *s)
static void static void
parse_keys(hdb_entry *ent, char *str) parse_keys(hdb_entry *ent, char *str)
{ {
char *save = NULL;
Key *key; Key *key;
int tmp; int tmp;
char *p; char *p;
int i; int i;
p = strtok_r(str, ":", &save);
p = strsep(&str, ":");
sscanf(p, "%d", &tmp); sscanf(p, "%d", &tmp);
ent->kvno = tmp; ent->kvno = tmp;
p = strtok_r(NULL, ":", &save); p = strsep(&str, ":");
while(p){ while(p){
Key *key; Key *key;
key = realloc(ent->keys.val, key = realloc(ent->keys.val,
@@ -120,16 +120,16 @@ parse_keys(hdb_entry *ent, char *str)
memset(key, 0, sizeof(*key)); memset(key, 0, sizeof(*key));
sscanf(p, "%d", &tmp); sscanf(p, "%d", &tmp);
key->mkvno = tmp; key->mkvno = tmp;
p = strtok_r(NULL, ":", &save); p = strsep(&str, ":");
sscanf(p, "%d", &tmp); sscanf(p, "%d", &tmp);
key->key.keytype = tmp; key->key.keytype = tmp;
p = strtok_r(NULL, ":", &save); p = strsep(&str, ":");
krb5_data_alloc(&key->key.keyvalue, (strlen(p) - 1) / 2 + 1); krb5_data_alloc(&key->key.keyvalue, (strlen(p) - 1) / 2 + 1);
for(i = 0; i < strlen(p); i += 2){ for(i = 0; i < strlen(p); i += 2){
sscanf(p + i, "%02x", &tmp); sscanf(p + i, "%02x", &tmp);
((u_char*)key->key.keyvalue.data)[i / 2] = tmp; ((u_char*)key->key.keyvalue.data)[i / 2] = tmp;
} }
p = strtok_r(NULL, ":", &save); p = strsep(&str, ":");
if (p == NULL) { if (p == NULL) {
key->salt = malloc(sizeof(*key->salt)); key->salt = malloc(sizeof(*key->salt));
krb5_data_zero (key->salt); krb5_data_zero (key->salt);
@@ -142,7 +142,7 @@ parse_keys(hdb_entry *ent, char *str)
((u_char*)key->salt->data)[i / 2] = tmp; ((u_char*)key->salt->data)[i / 2] = tmp;
} }
} }
p = strtok_r(NULL, ":", &save); p = strsep(&str, ":");
} }
} }
} }
@@ -150,16 +150,15 @@ parse_keys(hdb_entry *ent, char *str)
static Event* static Event*
parse_event(Event *ev, char *str) parse_event(Event *ev, char *str)
{ {
char *save = NULL;
char *p; char *p;
if(strcmp(str, "-") == 0) if(strcmp(str, "-") == 0)
return NULL; return NULL;
if(ev == NULL) if(ev == NULL)
ev = malloc(sizeof(*ev)); ev = malloc(sizeof(*ev));
memset(ev, 0, sizeof(*ev)); memset(ev, 0, sizeof(*ev));
p = strtok_r(str, ":", &save); p = strsep(&str, ":");
parse_time(&ev->time, p); parse_time(&ev->time, p);
p = strtok_r(NULL, ":", &save); p = strsep(&str, ":");
krb5_parse_name(context, p, &ev->principal); krb5_parse_name(context, p, &ev->principal);
return ev; return ev;
} }

19
kadmin/load.c
View File

@@ -99,15 +99,15 @@ parse_integer(unsigned *u, char *s)
static void static void
parse_keys(hdb_entry *ent, char *str) parse_keys(hdb_entry *ent, char *str)
{ {
char *save = NULL;
Key *key; Key *key;
int tmp; int tmp;
char *p; char *p;
int i; int i;
p = strtok_r(str, ":", &save);
p = strsep(&str, ":");
sscanf(p, "%d", &tmp); sscanf(p, "%d", &tmp);
ent->kvno = tmp; ent->kvno = tmp;
p = strtok_r(NULL, ":", &save); p = strsep(&str, ":");
while(p){ while(p){
Key *key; Key *key;
key = realloc(ent->keys.val, key = realloc(ent->keys.val,
@@ -120,16 +120,16 @@ parse_keys(hdb_entry *ent, char *str)
memset(key, 0, sizeof(*key)); memset(key, 0, sizeof(*key));
sscanf(p, "%d", &tmp); sscanf(p, "%d", &tmp);
key->mkvno = tmp; key->mkvno = tmp;
p = strtok_r(NULL, ":", &save); p = strsep(&str, ":");
sscanf(p, "%d", &tmp); sscanf(p, "%d", &tmp);
key->key.keytype = tmp; key->key.keytype = tmp;
p = strtok_r(NULL, ":", &save); p = strsep(&str, ":");
krb5_data_alloc(&key->key.keyvalue, (strlen(p) - 1) / 2 + 1); krb5_data_alloc(&key->key.keyvalue, (strlen(p) - 1) / 2 + 1);
for(i = 0; i < strlen(p); i += 2){ for(i = 0; i < strlen(p); i += 2){
sscanf(p + i, "%02x", &tmp); sscanf(p + i, "%02x", &tmp);
((u_char*)key->key.keyvalue.data)[i / 2] = tmp; ((u_char*)key->key.keyvalue.data)[i / 2] = tmp;
} }
p = strtok_r(NULL, ":", &save); p = strsep(&str, ":");
if (p == NULL) { if (p == NULL) {
key->salt = malloc(sizeof(*key->salt)); key->salt = malloc(sizeof(*key->salt));
krb5_data_zero (key->salt); krb5_data_zero (key->salt);
@@ -142,7 +142,7 @@ parse_keys(hdb_entry *ent, char *str)
((u_char*)key->salt->data)[i / 2] = tmp; ((u_char*)key->salt->data)[i / 2] = tmp;
} }
} }
p = strtok_r(NULL, ":", &save); p = strsep(&str, ":");
} }
} }
} }
@@ -150,16 +150,15 @@ parse_keys(hdb_entry *ent, char *str)
static Event* static Event*
parse_event(Event *ev, char *str) parse_event(Event *ev, char *str)
{ {
char *save = NULL;
char *p; char *p;
if(strcmp(str, "-") == 0) if(strcmp(str, "-") == 0)
return NULL; return NULL;
if(ev == NULL) if(ev == NULL)
ev = malloc(sizeof(*ev)); ev = malloc(sizeof(*ev));
memset(ev, 0, sizeof(*ev)); memset(ev, 0, sizeof(*ev));
p = strtok_r(str, ":", &save); p = strsep(&str, ":");
parse_time(&ev->time, p); parse_time(&ev->time, p);
p = strtok_r(NULL, ":", &save); p = strsep(&str, ":");
krb5_parse_name(context, p, &ev->principal); krb5_parse_name(context, p, &ev->principal);
return ev; return ev;
} }