summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-09-17 02:05:21 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-09-17 02:05:21 -0400
commitaf5a8090bffb245cc6b5a19669ffb1f10dfe7bc8 (patch)
treecc82782161e8a8a4ca87d69c0af6077424ee6077
parentde09c5fa4d12f8f7c6c2ecfa538b5baad2c05727 (diff)
parent408c5f2c9846780f05c2a3b3c837fecd5f5c74a6 (diff)
downloadframeworks_native-af5a8090bffb245cc6b5a19669ffb1f10dfe7bc8.zip
frameworks_native-af5a8090bffb245cc6b5a19669ffb1f10dfe7bc8.tar.gz
frameworks_native-af5a8090bffb245cc6b5a19669ffb1f10dfe7bc8.tar.bz2
Merge change 25440 into eclair
* changes: Fix a minor bug in is_alnum_string()...
-rw-r--r--cmds/keystore/netkeystore.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/cmds/keystore/netkeystore.c b/cmds/keystore/netkeystore.c
index 83c7871..87fdc80 100644
--- a/cmds/keystore/netkeystore.c
+++ b/cmds/keystore/netkeystore.c
@@ -116,10 +116,13 @@ static int parse_strings(char *data, int data_len, int ntokens, ...)
static int is_alnum_string(char *s)
{
+ char *s0 = s;
while (*s != 0) {
- if (!isalnum(*s++)) return 0;
+ if (!isalnum(*s++)) {
+ LOGE("The string '%s' is not an alphanumeric string\n", s0);
+ return 0;
+ }
}
- LOGE("The string %s is not an alphanumeric string\n", s);
return 1;
}
@@ -159,7 +162,9 @@ static void do_unlock(LPC_MARSHAL *cmd, LPC_MARSHAL *reply)
// no argument
static void do_get_state(LPC_MARSHAL *cmd, LPC_MARSHAL *reply)
{
- reply->retcode = get_state();
+ int s = get_state();
+ if (DBG) LOGD("keystore state = %d\n", s);
+ reply->retcode = s;
}
// args of listkeys():
@@ -413,12 +418,10 @@ int server_main(const int argc, const char *argv[])
// read the command, execute and send the result back.
if(read_marshal(s, &cmd)) goto err;
- if (DBG) LOGD("new connection\n");
execute(&cmd, &reply);
write_marshal(s, &reply);
err:
memset(&reply, 0, sizeof(LPC_MARSHAL));
- if (DBG) LOGD("closing connection\n");
close(s);
}