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

using fbtk directory, patch from Mathias Gumz

Browse source
This commit is contained in:
fluxgen 2004-04-19 18:10:44 +00:00
parent 95c20b15f9
commit 1355708ae2
1 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
util/fbrun/FbRun.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: FbRun.cc,v 1.27 2004/04/18 18:57:24 fluxgen Exp $ // $Id: FbRun.cc,v 1.28 2004/04/19 18:10:44 fluxgen Exp $
#include "FbRun.hh" #include "FbRun.hh"
@ -27,6 +27,7 @@
#include "EventManager.hh" #include "EventManager.hh"
#include "Color.hh" #include "Color.hh"
#include "KeyUtil.hh" #include "KeyUtil.hh"
#include "Directory.hh"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
@ -42,11 +43,6 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
#include <unistd.h>
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
#include <fstream> #include <fstream>
@ -102,34 +98,30 @@ FbRun::FbRun(int x, int y, size_t width):
XSetWMHints(m_display, window(), &wmhints); XSetWMHints(m_display, window(), &wmhints);
} }
string path= getenv("PATH"); string path= getenv("PATH");
unsigned int l; unsigned int l;
unsigned int r; unsigned int r;
FbTk::Directory dir;
for(l= 0, r= 0; r < path.size(); r++) { for(l= 0, r= 0; r < path.size(); r++) {
if (path[r]==':' && r - l > 0) { if ((path[r]==':' || r == path.size() - 1) && r - l > 0) {
struct dirent** namelist;
struct stat buf;
int n;
string dir= path.substr(l, r - l); string filename;
n= scandir(dir.c_str(), &namelist, 0, alphasort); string fncomplete;
dir.open(path.substr(l, r - l).c_str());
int n= dir.entries();
if (n >= 0) { if (n >= 0) {
while(n--) { while(n--) {
if (!stat((dir + "/" + namelist[n]->d_name).c_str(), &buf) filename= dir.readFilename();
&& S_ISREG(buf.st_mode) && fncomplete= dir.name() + "/" + filename;
(buf.st_mode & S_IXUSR if (dir.isRegularFile(fncomplete) &&
|| buf.st_mode & S_IXGRP dir.isExecutable(fncomplete)) {
|| buf.st_mode & S_IXOTH)) { m_apps.push_back(filename);
m_apps.push_back(namelist[n]->d_name);
} }
free(namelist[n]);
} }
free(namelist);
} }
l= r + 1; l= r + 1;
dir.close();
} }
} }