X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcutil.c;h=04b1036358433e3163c75ef64076f2b412cb5985;hb=9905799a86c606304fd7df2cd401de1740a272a1;hp=4ac00f38363803b05857ee774b61ef0a8cb3af86;hpb=c08107c80b816558a1c48ada27eaf23840793157;p=silc.git diff --git a/lib/silcutil/silcutil.c b/lib/silcutil/silcutil.c index 4ac00f38..04b10363 100644 --- a/lib/silcutil/silcutil.c +++ b/lib/silcutil/silcutil.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 1997 - 2002 Pekka Riikonen + Copyright (C) 1997 - 2007 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ */ /* $Id$ */ -#include "silcincludes.h" +#include "silc.h" /* Gets line from a buffer. Stops reading when a newline or EOF occurs. This doesn't remove the newline sign from the destination buffer. The @@ -78,66 +78,77 @@ int silc_check_line(char *buf) return 0; } -/* Returns current time as string. */ +/* Converts string to capital characters. */ -char *silc_get_time() +SilcBool silc_to_upper(const char *string, char *dest, SilcUInt32 dest_size) { - time_t curtime; - char *return_time; + int i; + + if (strlen(string) > dest_size) + return FALSE; - curtime = time(NULL); - return_time = ctime(&curtime); - return_time[strlen(return_time) - 1] = '\0'; + for (i = 0; i < strlen(string); i++) + dest[i] = (char)toupper((int)string[i]); - return return_time; + return TRUE; } -/* Converts string to capital characters. */ +/* Converts string to lower letter characters. */ -char *silc_to_upper(char *string) +SilcBool silc_to_lower(const char *string, char *dest, SilcUInt32 dest_size) { int i; - char *ret = silc_calloc(strlen(string) + 1, sizeof(char)); + + if (strlen(string) > dest_size) + return FALSE; for (i = 0; i < strlen(string); i++) - ret[i] = toupper(string[i]); + dest[i] = (char)tolower((int)string[i]); - return ret; + return TRUE; } /* Parse userfqdn string which is in user@fqdn format. */ -bool silc_parse_userfqdn(const char *string, char **left, char **right) +int silc_parse_userfqdn(const char *string, + char *user, SilcUInt32 user_size, + char *fqdn, SilcUInt32 fqdn_size) { SilcUInt32 tlen; + if (!user && !fqdn) + return 0; + + memset(user, 0, user_size); + memset(fqdn, 0, fqdn_size); + if (!string) - return FALSE; + return 0; if (string[0] == '@') { - if (left) - *left = strdup(string); - return TRUE; + if (user) + silc_strncat(user, user_size, string, strlen(string)); + + return 1; } if (strchr(string, '@')) { tlen = strcspn(string, "@"); - if (left) { - *left = silc_calloc(tlen + 1, sizeof(char)); - memcpy(*left, string, tlen); - } + if (user) + silc_strncat(user, user_size, string, tlen); - if (right) { - *right = silc_calloc((strlen(string) - tlen) + 1, sizeof(char)); - memcpy(*right, string + tlen + 1, strlen(string) - tlen - 1); - } - } else { - if (left) - *left = strdup(string); + if (fqdn) + silc_strncat(fqdn, fqdn_size, string + tlen + 1, + strlen(string) - tlen - 1); + + return 2; } - return TRUE; + if (user) + silc_strncat(user, user_size, string, strlen(string)); + + return 1; } /* Parses command line. At most `max_args' is taken. Rest of the line @@ -162,7 +173,10 @@ void silc_parse_command_line(unsigned char *buffer, /* Get the command first */ len = strcspn(cp, " "); - tmp = silc_to_upper((char *)cp); + tmp = silc_calloc(strlen(cp) + 1, sizeof(*tmp)); + if (!tmp) + return; + silc_to_upper(cp, tmp, strlen(cp)); (*parsed)[0] = silc_calloc(len + 1, sizeof(char)); memcpy((*parsed)[0], tmp, len); silc_free(tmp); @@ -218,220 +232,47 @@ void silc_parse_command_line(unsigned char *buffer, char *silc_format(char *fmt, ...) { va_list args; - static char buf[8192]; + char buf[8192]; memset(buf, 0, sizeof(buf)); va_start(args, fmt); - vsnprintf(buf, sizeof(buf) - 1, fmt, args); + vsilc_snprintf(buf, sizeof(buf) - 1, fmt, args); va_end(args); return strdup(buf); } -/* Renders ID to suitable to print for example to log file. */ - -static char rid[256]; -#define _PUT_STRING(__d__, __s__) \ -do { \ - int __sp = sizeof(__d__) - 1 - strlen(__d__); \ - if (__sp < strlen(__s__)) { \ - if (__sp) \ - strncat(__d__, __s__, (sizeof(__d__) - 1) - strlen(__d__)); \ - } else { \ - strncat(__d__, __s__, strlen(__s__)); \ - } \ -} while(0) - -char *silc_id_render(void *id, SilcUInt16 type) -{ - char tmp[100]; - unsigned char tmps[2]; - char *cp; - - memset(rid, 0, sizeof(rid)); - switch(type) { - case SILC_ID_SERVER: - { - SilcServerID *server_id = (SilcServerID *)id; - if (server_id->ip.data_len > 4) { -#ifdef HAVE_IPV6 - struct sockaddr_in6 ipv6; - memset(&ipv6, 0, sizeof(ipv6)); - ipv6.sin6_family = AF_INET6; - memmove(&ipv6.sin6_addr, server_id->ip.data, sizeof(ipv6.sin6_addr)); - if (!getnameinfo((struct sockaddr *)&ipv6, sizeof(ipv6), - tmp, sizeof(tmp) - 1, NULL, 0, NI_NUMERICHOST)) - _PUT_STRING(rid, tmp); -#endif - } else { - struct in_addr ipv4; - memmove(&ipv4.s_addr, server_id->ip.data, 4); - cp = inet_ntoa(ipv4); - if (cp) - _PUT_STRING(rid, cp); - } - - memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp) - 1, ",%d,", ntohs(server_id->port)); - _PUT_STRING(rid, tmp); - SILC_PUT16_MSB(server_id->rnd, tmps); - memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp) - 1, "[%02x %02x]", tmps[0], tmps[1]); - _PUT_STRING(rid, tmp); - } - break; - case SILC_ID_CLIENT: - { - SilcClientID *client_id = (SilcClientID *)id; - if (client_id->ip.data_len > 4) { -#ifdef HAVE_IPV6 - struct sockaddr_in6 ipv6; - memset(&ipv6, 0, sizeof(ipv6)); - ipv6.sin6_family = AF_INET6; - memmove(&ipv6.sin6_addr, client_id->ip.data, sizeof(ipv6.sin6_addr)); - if (!getnameinfo((struct sockaddr *)&ipv6, sizeof(ipv6), - tmp, sizeof(tmp) - 1, NULL, 0, NI_NUMERICHOST)) - _PUT_STRING(rid, tmp); -#endif - } else { - struct in_addr ipv4; - memmove(&ipv4.s_addr, client_id->ip.data, 4); - cp = inet_ntoa(ipv4); - if (cp) - _PUT_STRING(rid, cp); - } - - memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp) - 1, ",%02x,", client_id->rnd); - _PUT_STRING(rid, tmp); - memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp) - 1, "[%02x %02x %02x %02x...]", - client_id->hash[0], client_id->hash[1], - client_id->hash[2], client_id->hash[3]); - _PUT_STRING(rid, tmp); - } - break; - case SILC_ID_CHANNEL: - { - SilcChannelID *channel_id = (SilcChannelID *)id; - if (channel_id->ip.data_len > 4) { -#ifdef HAVE_IPV6 - struct sockaddr_in6 ipv6; - memset(&ipv6, 0, sizeof(ipv6)); - ipv6.sin6_family = AF_INET6; - memmove(&ipv6.sin6_addr, channel_id->ip.data, sizeof(ipv6.sin6_addr)); - if (!getnameinfo((struct sockaddr *)&ipv6, sizeof(ipv6), - tmp, sizeof(tmp) - 1, NULL, 0, NI_NUMERICHOST)) - _PUT_STRING(rid, tmp); -#endif - } else { - struct in_addr ipv4; - memmove(&ipv4.s_addr, channel_id->ip.data, 4); - cp = inet_ntoa(ipv4); - if (cp) - _PUT_STRING(rid, cp); - } - - memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp) - 1, ",%d,", ntohs(channel_id->port)); - _PUT_STRING(rid, tmp); - SILC_PUT16_MSB(channel_id->rnd, tmps); - memset(tmp, 0, sizeof(tmp)); - snprintf(tmp, sizeof(tmp) - 1, "[%02x %02x]", tmps[0], tmps[1]); - _PUT_STRING(rid, tmp); - } - break; - } - - return rid; -} -#undef _PUT_STRING - -/* Compares two strings. Strings may include wildcards '*' and '?'. - Returns TRUE if strings match. */ +/* Basic has function to hash strings. May be used with the SilcHashTable. + Note that this lowers the characters of the string (with tolower()) so + this is used usually with nicknames, channel and server names to provide + case insensitive keys. */ -int silc_string_compare(char *string1, char *string2) +SilcUInt32 silc_hash_string(void *key, void *user_context) { - int i; - int slen1; - int slen2; - char *tmpstr1, *tmpstr2; - - if (!string1 || !string2) - return FALSE; - - slen1 = strlen(string1); - slen2 = strlen(string2); - - /* See if they are same already */ - if (!strncmp(string1, string2, strlen(string2))) - return TRUE; - - if (slen2 < slen1) - if (!strchr(string1, '*')) - return FALSE; - - /* Take copies of the original strings as we will change them */ - tmpstr1 = silc_calloc(slen1 + 1, sizeof(char)); - memcpy(tmpstr1, string1, slen1); - tmpstr2 = silc_calloc(slen2 + 1, sizeof(char)); - memcpy(tmpstr2, string2, slen2); - - for (i = 0; i < slen1; i++) { + char *s = (char *)key; + SilcUInt32 h = 0, g; - /* * wildcard. Only one * wildcard is possible. */ - if (tmpstr1[i] == '*') - if (!strncmp(tmpstr1, tmpstr2, i)) { - memset(tmpstr2, 0, slen2); - strncpy(tmpstr2, tmpstr1, i); - break; - } - - /* ? wildcard */ - if (tmpstr1[i] == '?') { - if (!strncmp(tmpstr1, tmpstr2, i)) { - if (!(slen1 < i + 1)) - if (tmpstr1[i + 1] != '?' && - tmpstr1[i + 1] != tmpstr2[i + 1]) - continue; - - if (!(slen1 < slen2)) - tmpstr2[i] = '?'; - } + while (*s != '\0') { + h = (h << 4) + tolower((int)*s); + if ((g = h & 0xf0000000)) { + h = h ^ (g >> 24); + h = h ^ g; } + s++; } - /* if using *, remove it */ - if (strchr(tmpstr1, '*')) - *strchr(tmpstr1, '*') = 0; - - if (!strcmp(tmpstr1, tmpstr2)) { - memset(tmpstr1, 0, slen1); - memset(tmpstr2, 0, slen2); - silc_free(tmpstr1); - silc_free(tmpstr2); - return TRUE; - } - - memset(tmpstr1, 0, slen1); - memset(tmpstr2, 0, slen2); - silc_free(tmpstr1); - silc_free(tmpstr2); - return FALSE; + return h; } -/* Basic has function to hash strings. May be used with the SilcHashTable. - Note that this lowers the characters of the string (with tolower()) so - this is used usually with nicknames, channel and server names to provide - case insensitive keys. */ +/* Hash UTF-8 string */ -SilcUInt32 silc_hash_string(void *key, void *user_context) +SilcUInt32 silc_hash_utf8_string(void *key, void *user_context) { - char *s = (char *)key; + unsigned char *s = (unsigned char *)key; SilcUInt32 h = 0, g; while (*s != '\0') { - h = (h << 4) + tolower(*s); + h = (h << 4) + *s; if ((g = h & 0xf0000000)) { h = h ^ (g >> 24); h = h ^ g; @@ -446,21 +287,21 @@ SilcUInt32 silc_hash_string(void *key, void *user_context) SilcUInt32 silc_hash_uint(void *key, void *user_context) { - return *(SilcUInt32 *)key; + return SILC_PTR_TO_32(key); } /* Basic hash funtion to hash pointers. May be used with the SilcHashTable. */ SilcUInt32 silc_hash_ptr(void *key, void *user_context) { - return (SilcUInt32)key; + return SILC_PTR_TO_32(key); } /* Hash a ID. The `user_context' is the ID type. */ SilcUInt32 silc_hash_id(void *key, void *user_context) { - SilcIdType id_type = (SilcIdType)(SilcUInt32)user_context; + SilcIdType id_type = (SilcIdType)SILC_PTR_TO_32(user_context); SilcUInt32 h = 0; int i; @@ -468,22 +309,12 @@ SilcUInt32 silc_hash_id(void *key, void *user_context) case SILC_ID_CLIENT: { SilcClientID *id = (SilcClientID *)key; - SilcUInt32 g; /* The client ID is hashed by hashing the hash of the ID (which is a truncated MD5 hash of the nickname) so that we can access the entry from the cache with both Client ID but with just a hash from the ID as well. */ - - for (i = 0; i < sizeof(id->hash); i++) { - h = (h << 4) + id->hash[i]; - if ((g = h & 0xf0000000)) { - h = h ^ (g >> 24); - h = h ^ g; - } - } - - return h; + return silc_hash_client_id_hash(id->hash, NULL); } break; case SILC_ID_SERVER: @@ -515,11 +346,30 @@ SilcUInt32 silc_hash_id(void *key, void *user_context) return h; } +/* Hash Client ID's hash. */ + +SilcUInt32 silc_hash_client_id_hash(void *key, void *user_context) +{ + int i; + unsigned char *hash = key; + SilcUInt32 h = 0, g; + + for (i = 0; i < CLIENTID_HASH_LEN; i++) { + h = (h << 4) + hash[i]; + if ((g = h & 0xf0000000)) { + h = h ^ (g >> 24); + h = h ^ g; + } + } + + return h; +} + /* Hash binary data. The `user_context' is the data length. */ SilcUInt32 silc_hash_data(void *key, void *user_context) { - SilcUInt32 len = (SilcUInt32)user_context, h = 0; + SilcUInt32 len = SILC_PTR_TO_32(user_context), h = 0; unsigned char *data = (unsigned char *)key; int i; @@ -530,20 +380,29 @@ SilcUInt32 silc_hash_data(void *key, void *user_context) return h; } -/* Hashed SILC Public key. */ +/* Hash public key of any type. */ SilcUInt32 silc_hash_public_key(void *key, void *user_context) { - SilcPublicKey pk = (SilcPublicKey)key; - return (pk->len + silc_hash_string(pk->name, NULL) + - silc_hash_string(pk->identifier, NULL) + - silc_hash_data(pk->pk, (void *)pk->pk_len)); + SilcPublicKey public_key = key; + unsigned char *pk; + SilcUInt32 pk_len; + SilcUInt32 hash = 0; + + pk = silc_pkcs_public_key_encode(public_key, &pk_len); + if (!pk) + return hash; + + hash = silc_hash_data(pk, SILC_32_TO_PTR(pk_len)); + silc_free(pk); + + return hash; } /* Compares two strings. It may be used as SilcHashTable comparison function. */ -bool silc_hash_string_compare(void *key1, void *key2, void *user_context) +SilcBool silc_hash_string_compare(void *key1, void *key2, void *user_context) { return !strcasecmp((char *)key1, (char *)key2); } @@ -552,130 +411,56 @@ bool silc_hash_string_compare(void *key1, void *key2, void *user_context) The Client ID's compares only the hash of the Client ID not any other part of the Client ID. Other ID's are fully compared. */ -bool silc_hash_id_compare(void *key1, void *key2, void *user_context) +SilcBool silc_hash_id_compare(void *key1, void *key2, void *user_context) { - SilcIdType id_type = (SilcIdType)(SilcUInt32)user_context; + SilcIdType id_type = (SilcIdType)SILC_PTR_TO_32(user_context); return (id_type == SILC_ID_CLIENT ? SILC_ID_COMPARE_HASH((SilcClientID *)key1, (SilcClientID *)key2) : SILC_ID_COMPARE_TYPE(key1, key2, id_type)); } -/* Compare two Client ID's entirely and not just the hash from the ID. */ +/* Compares two ID's. Compares full IDs. */ -bool silc_hash_client_id_compare(void *key1, void *key2, void *user_context) +SilcBool silc_hash_id_compare_full(void *key1, void *key2, void *user_context) { - return SILC_ID_COMPARE_TYPE(key1, key2, SILC_ID_CLIENT); -} - -/* Compares binary data. May be used as SilcHashTable comparison function. */ - -bool silc_hash_data_compare(void *key1, void *key2, void *user_context) -{ - SilcUInt32 len = (SilcUInt32)user_context; - return !memcmp(key1, key2, len); + SilcIdType id_type = (SilcIdType)SILC_PTR_TO_32(user_context); + return SILC_ID_COMPARE_TYPE(key1, key2, id_type); } -/* Compares two SILC Public keys. It may be used as SilcHashTable - comparison function. */ +/* Compare two Client ID's entirely and not just the hash from the ID. */ -bool silc_hash_public_key_compare(void *key1, void *key2, void *user_context) +SilcBool silc_hash_client_id_compare(void *key1, void *key2, + void *user_context) { - return silc_pkcs_public_key_compare(key1, key2); + return SILC_ID_COMPARE_TYPE(key1, key2, SILC_ID_CLIENT); } -/* Parses mode mask and returns the mode as string. */ +/* Compares binary data. May be used as SilcHashTable comparison function. */ -char *silc_client_chmode(SilcUInt32 mode, const char *cipher, const char *hmac) +SilcBool silc_hash_data_compare(void *key1, void *key2, void *user_context) { - char string[100]; - - if (!mode) - return NULL; - - memset(string, 0, sizeof(string)); - - if (mode & SILC_CHANNEL_MODE_PRIVATE) - strncat(string, "p", 1); - - if (mode & SILC_CHANNEL_MODE_SECRET) - strncat(string, "s", 1); - - if (mode & SILC_CHANNEL_MODE_PRIVKEY) - strncat(string, "k", 1); - - if (mode & SILC_CHANNEL_MODE_INVITE) - strncat(string, "i", 1); - - if (mode & SILC_CHANNEL_MODE_TOPIC) - strncat(string, "t", 1); - - if (mode & SILC_CHANNEL_MODE_ULIMIT) - strncat(string, "l", 1); - - if (mode & SILC_CHANNEL_MODE_PASSPHRASE) - strncat(string, "a", 1); - - if (mode & SILC_CHANNEL_MODE_FOUNDER_AUTH) - strncat(string, "f", 1); - - if (mode & SILC_CHANNEL_MODE_SILENCE_USERS) - strncat(string, "m", 1); - - if (mode & SILC_CHANNEL_MODE_SILENCE_OPERS) - strncat(string, "M", 1); - - if (mode & SILC_CHANNEL_MODE_CIPHER) - strncat(string, cipher, strlen(cipher)); - - if (mode & SILC_CHANNEL_MODE_HMAC) - strncat(string, hmac, strlen(hmac)); - - /* Rest of mode is ignored */ - - return strdup(string); + SilcUInt32 len = SILC_PTR_TO_32(user_context); + return !memcmp(key1, key2, len); } -/* Parses channel user mode mask and returns te mode as string */ +/* Compares UTF-8 string. */ -char *silc_client_chumode(SilcUInt32 mode) +SilcBool silc_hash_utf8_compare(void *key1, void *key2, void *user_context) { - char string[4]; - - if (!mode) - return NULL; - - memset(string, 0, sizeof(string)); - - if (mode & SILC_CHANNEL_UMODE_CHANFO) - strncat(string, "f", 1); - - if (mode & SILC_CHANNEL_UMODE_CHANOP) - strncat(string, "o", 1); - - if (mode & SILC_CHANNEL_UMODE_BLOCK_MESSAGES) - strncat(string, "b", 1); - - return strdup(string); + int l1 = strlen((char *)key1); + int l2 = strlen((char *)key2); + if (l1 != l2) + return FALSE; + return !memcmp(key1, key2, l2); } -/* Parses channel user mode and returns it as special mode character. */ +/* Compares two SILC Public keys. It may be used as SilcHashTable + comparison function. */ -char *silc_client_chumode_char(SilcUInt32 mode) +SilcBool silc_hash_public_key_compare(void *key1, void *key2, + void *user_context) { - char string[4]; - - if (!mode) - return NULL; - - memset(string, 0, sizeof(string)); - - if (mode & SILC_CHANNEL_UMODE_CHANFO) - strncat(string, "*", 1); - - if (mode & SILC_CHANNEL_UMODE_CHANOP) - strncat(string, "@", 1); - - return strdup(string); + return silc_pkcs_public_key_compare(key1, key2); } /* Creates fingerprint from data, usually used with SHA1 digests */ @@ -688,14 +473,14 @@ char *silc_fingerprint(const unsigned char *data, SilcUInt32 data_len) memset(fingerprint, 0, sizeof(fingerprint)); cp = fingerprint; for (i = 0; i < data_len; i++) { - snprintf(cp, sizeof(fingerprint), "%02X", data[i]); + silc_silc_snprintf(cp, sizeof(fingerprint), "%02X", data[i]); cp += 2; if ((i + 1) % 2 == 0) - snprintf(cp++, sizeof(fingerprint), " "); + silc_silc_snprintf(cp++, sizeof(fingerprint), " "); if ((i + 1) % 10 == 0) - snprintf(cp++, sizeof(fingerprint), " "); + silc_silc_snprintf(cp++, sizeof(fingerprint), " "); } i--; if ((i + 1) % 2 == 0) @@ -708,7 +493,7 @@ char *silc_fingerprint(const unsigned char *data, SilcUInt32 data_len) /* Return TRUE if the `data' is ASCII string. */ -bool silc_string_is_ascii(const unsigned char *data, SilcUInt32 data_len) +SilcBool silc_string_is_ascii(const unsigned char *data, SilcUInt32 data_len) { int i; @@ -720,108 +505,17 @@ bool silc_string_is_ascii(const unsigned char *data, SilcUInt32 data_len) return TRUE; } -/* Parses SILC protocol style version string. */ - -bool silc_parse_version_string(const char *version, - SilcUInt32 *protocol_version, - char **protocol_version_string, - SilcUInt32 *software_version, - char **software_version_string, - char **vendor_version) -{ - char *cp, buf[32]; - int maj = 0, min = 0; - - if (!strstr(version, "SILC-")) - return FALSE; - - cp = (char *)version + 5; - if (!cp) - return FALSE; - - /* Take protocol version */ - - maj = atoi(cp); - cp = strchr(cp, '.'); - if (cp) { - min = atoi(cp + 1); - cp++; - } - - memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf) - 1, "%d%d", maj, min); - if (protocol_version) - *protocol_version = atoi(buf); - memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf) - 1, "%d.%d", maj, min); - if (protocol_version_string) - *protocol_version_string = strdup(buf); - - /* Take software version */ - - maj = 0; - min = 0; - cp = strchr(cp, '-'); - if (!cp) - return FALSE; - - maj = atoi(cp + 1); - cp = strchr(cp, '.'); - if (cp) - min = atoi(cp + 1); - - memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf) - 1, "%d%d", maj, min); - if (software_version) - *software_version = atoi(buf); - memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf) - 1, "%d.%d", maj, min); - if (software_version_string) - *software_version_string = strdup(buf); - - /* Take vendor string */ - - cp++; - if (cp) { - cp = strchr(cp, '.'); - if (cp && cp + 1 && vendor_version) - *vendor_version = strdup(cp + 1); - } - - return TRUE; -} - -/* Converts version string x.x into number representation. */ - -SilcUInt32 silc_version_to_num(const char *version) -{ - int maj = 0, min = 0; - char *cp, buf[32]; - - if (!version) - return 0; - - cp = (char *)version; - maj = atoi(cp); - cp = strchr(cp, '.'); - if (cp) - min = atoi(cp + 1); - - memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf) - 1, "%d%d", maj, min); - return (SilcUInt32)atoi(buf); -} - /* Displays input prompt on command line and takes input data from user */ -char *silc_get_input(const char *prompt, bool echo_off) +char *silc_get_input(const char *prompt, SilcBool echo_off) { #ifdef SILC_UNIX + int fd; + char input[2048]; + if (echo_off) { char *ret = NULL; #ifdef HAVE_TERMIOS_H - char input[2048]; - int fd; struct termios to; struct termios to_old; @@ -837,8 +531,10 @@ char *silc_get_input(const char *prompt, bool echo_off) tcgetattr(fd, &to); to_old = to; - /* Echo OFF */ + /* Echo OFF, and assure we can prompt and get input */ to.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL); + to.c_lflag |= ICANON; + to.c_cc[VMIN] = 255; tcsetattr(fd, TCSANOW, &to); memset(input, 0, sizeof(input)); @@ -848,6 +544,7 @@ char *silc_get_input(const char *prompt, bool echo_off) if ((read(fd, input, sizeof(input))) < 0) { fprintf(stderr, "silc: %s\n", strerror(errno)); + tcsetattr(fd, TCSANOW, &to_old); return NULL; } @@ -863,15 +560,11 @@ char *silc_get_input(const char *prompt, bool echo_off) tcsetattr(fd, TCSANOW, &to_old); signal(SIGINT, SIG_DFL); - ret = silc_calloc(strlen(input), sizeof(char)); - memcpy(ret, input, strlen(input)); + ret = silc_memdup(input, strlen(input)); memset(input, 0, sizeof(input)); #endif /* HAVE_TERMIOS_H */ return ret; } else { - char input[2048]; - int fd; - fd = open("/dev/tty", O_RDONLY); if (fd < 0) { fprintf(stderr, "silc: %s\n", strerror(errno));