nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check for errno while parsing the deco mask

Browse source
This commit is contained in:
Mathias Gumz 2009-09-12 16:03:42 +02:00
parent 6a37a047eb
commit 5f958b3bd5
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/WindowState.cc
View file

@ -23,7 +23,8 @@
#include "FbTk/StringUtil.hh" #include "FbTk/StringUtil.hh"
#include <stdlib.h> #include <cstdlib>
#include <errno.h>
bool WindowState::useBorder() const { bool WindowState::useBorder() const {
return !fullscreen && maximized != MAX_FULL && deco_mask & DECORM_BORDER; return !fullscreen && maximized != MAX_FULL && deco_mask & DECORM_BORDER;
@ -92,10 +93,14 @@ int WindowState::getDecoMaskFromString(const std::string &str_label) {
return DECOR_BORDER; return DECOR_BORDER;
if (label == "tab") if (label == "tab")
return DECOR_TAB; return DECOR_TAB;
int mask = -1; int mask = -1;
if ((str_label.size() > 1 && str_label[0] == '0' && str_label[1] == 'x') || int tmp;
(str_label.size() > 0 && isdigit(str_label[0]))) errno = 0;
mask = strtol(str_label.c_str(), NULL, 0); tmp = strtol(str_label.c_str(), NULL, 0);
if (errno == 0)
mask = tmp;
return mask; return mask;
} }