Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

check whether atoi success

This commit is contained in:
Arnaud Fontaine 2007-11-26 18:23:15 +01:00 committed by Julien Danjou
parent de8ea9dde4
commit ece6bb27f3
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tag.c
View File

@ -67,21 +67,24 @@ void
uicb_client_tag(awesome_config *awesomeconf, uicb_client_tag(awesome_config *awesomeconf,
const char *arg) const char *arg)
{ {
int i; int i, tag_id = -1;
Client *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel; Client *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;
if(!sel) if(!sel)
return; return;
if(arg)
{
tag_id = atoi(arg) - 1;
if(tag_id < 0 || tag_id >= awesomeconf->ntags)
return;
}
for(i = 0; i < awesomeconf->ntags; i++) for(i = 0; i < awesomeconf->ntags; i++)
sel->tags[i] = arg == NULL; sel->tags[i] = arg == NULL;
if(arg) if(tag_id != -1)
{ sel->tags[tag_id] = True;
i = atoi(arg) - 1;
if(i >= 0 && i < awesomeconf->ntags)
sel->tags[i] = True;
}
saveprops(sel, awesomeconf->ntags); saveprops(sel, awesomeconf->ntags);
arrange(awesomeconf); arrange(awesomeconf);
@ -129,7 +132,7 @@ uicb_client_toggletag(awesome_config *awesomeconf,
{ {
i = atoi(arg) - 1; i = atoi(arg) - 1;
if(i >= awesomeconf->ntags) if(i < 0 || i >= awesomeconf->ntags)
return; return;
sel->tags[i] = !sel->tags[i]; sel->tags[i] = !sel->tags[i];
@ -159,7 +162,7 @@ uicb_tag_toggleview(awesome_config *awesomeconf,
i = arg ? atoi(arg) - 1: 0; i = arg ? atoi(arg) - 1: 0;
if(i >= awesomeconf->ntags) if(i < 0 || i >= awesomeconf->ntags)
return; return;
awesomeconf->tags[i].selected = !awesomeconf->tags[i].selected; awesomeconf->tags[i].selected = !awesomeconf->tags[i].selected;
@ -182,7 +185,14 @@ void
uicb_tag_view(awesome_config *awesomeconf, uicb_tag_view(awesome_config *awesomeconf,
const char *arg) const char *arg)
{ {
int i; int i, tag_id = -1;
if(arg)
{
tag_id = atoi(arg) - 1;
if(tag_id < 0 || tag_id >= awesomeconf->ntags)
return;
}
for(i = 0; i < awesomeconf->ntags; i++) for(i = 0; i < awesomeconf->ntags; i++)
{ {
@ -190,12 +200,8 @@ uicb_tag_view(awesome_config *awesomeconf,
awesomeconf->tags[i].selected = arg == NULL; awesomeconf->tags[i].selected = arg == NULL;
} }
if(arg) if(tag_id != -1)
{ awesomeconf->tags[tag_id].selected = True;
i = atoi(arg) - 1;
if(i >= 0 && i < awesomeconf->ntags)
awesomeconf->tags[i].selected = True;
}
saveawesomeprops(awesomeconf); saveawesomeprops(awesomeconf);
arrange(awesomeconf); arrange(awesomeconf);