philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup get_term_capability(), silences some warnings.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@463 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2013-11-13 13:35:10 +00:00
parent 58b5d39fea
commit b2ae3c888f
1 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/term.c
View File

@@ -1832,18 +1832,23 @@ void set_meta_8bit (Window *w, char *u, int value)
meta_mode = (current_term->TI_km == 0 ? 0 : 1); meta_mode = (current_term->TI_km == 0 ? 0 : 1);
} }
char * control_mangle (unsigned char *text) /* control_mangle()
*
* Convert control characters in a string into printable sequences. */
static char *control_mangle(char *text)
{ {
static u_char retval[256]; static char retval[256];
int pos = 0; int pos;
*retval = 0;
if (!text) if (!text)
return retval;
for (; *text && (pos < 254); text++, pos++)
{ {
if (*text < 32) *retval = 0;
return retval;
}
for (pos = 0; *text && (pos < 254); text++, pos++)
{
if (*text >= 0 && *text < 32)
{ {
retval[pos++] = '^'; retval[pos++] = '^';
retval[pos] = *text + 64; retval[pos] = *text + 64;
@@ -1861,9 +1866,13 @@ static u_char retval[256];
return retval; return retval;
} }
/* get_term_capability()
*
* Returns a named terminal capability of the current terminal as a string.
*/
char *get_term_capability(char *name, int querytype, int mangle) char *get_term_capability(char *name, int querytype, int mangle)
{ {
static char retval[128]; static char retval[256];
const char *compare = empty_string; const char *compare = empty_string;
int x; int x;
cap2info *t; cap2info *t;
@@ -1880,21 +1889,24 @@ static char retval[128];
if (!strcmp(name, compare)) if (!strcmp(name, compare))
{ {
char *control_str;
if (!t->ptr)
return NULL;
switch (t->type) switch (t->type)
{ {
case CAP_TYPE_BOOL: case CAP_TYPE_BOOL:
case CAP_TYPE_INT: case CAP_TYPE_INT:
if (!(int *)t->ptr) strlcpy(retval, ltoa(*(int *)(t->ptr)), sizeof retval);
return NULL;
strcpy(retval, ltoa(* (int *)(t->ptr)));
return retval; return retval;
case CAP_TYPE_STR: case CAP_TYPE_STR:
if (!(char **)t->ptr || !*(char **)t->ptr) control_str = *(char **)t->ptr;
if (!control_str)
return NULL; return NULL;
strcpy(retval, mangle ? strlcpy(retval,
control_mangle(*(char **)t->ptr) : mangle ? control_mangle(control_str) : control_str,
(*(char **)t->ptr)); sizeof retval);
return retval; return retval;
} }
} }