mirrors/wmii
1
0
Fork 0
mirror of https://github.com/0intro/wmii synced 2025-03-02 05:01:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed mkqid to prevent issue reported by bogon

Browse Source
This commit is contained in:
Anselm R. Garbe 2006-03-05 16:48:14 +01:00
parent 421ac8babf
commit dcc6e16302
3 changed files with 136 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
cmd/wm/fs.c
View File

@ -48,27 +48,28 @@ static char Enocommand[] = "command not supported";
* /bar/1/colors FsFcolors <#RRGGBB> <#RRGGBB> <#RRGGBB> * /bar/1/colors FsFcolors <#RRGGBB> <#RRGGBB> <#RRGGBB>
* /event FsFevent * /event FsFevent
* /ctl FsFctl command interface (root) * /ctl FsFctl command interface (root)
* /new/ FsDtag returns new tag * /ws/ FsDws returns new tag
* /sel/ FsDtag sel tag * /ws/ FsDws tag
* /1/ FsDtag tag * /ws/ctl FsFctl command interface (tag)
* /1/ctl FsFctl command interface (tag) * /ws/sel/ FsDarea
* /1/sel/ FsDarea * /ws/float/ FsDarea floating clients in area 0
* /1/float/ FsDarea floating clients in area 0 * /ws/float/ctl FsFctl command interface (area)
* /1/float/ctl FsFctl command interface (area) * /ws/float/mode FsFmode col mode
* /1/float/mode FsFmode col mode * /ws/float/sel/ FsDclient
* /1/float/sel/ FsDclient * /ws/float/1/ FsDclient
* /1/float/1/ FsDclient * /ws/float/1/name FsFname name of client
* /1/float/1/name FsFname name of client * /ws/float/1/tag FsFtag tag of client
* /1/float/1/geom FsFgeom geometry of client * /ws/float/1/geom FsFgeom geometry of client
* /1/float/1/ctl FsFctl command interface (client) * /ws/float/1/ctl FsFctl command interface (client)
* /1/1/ FsDarea * /ws/1/ FsDarea
* /1/1/ctl FsFctl command interface (area) * /ws/1/ctl FsFctl command interface (area)
* /1/1/mode FsFmode col mode * /ws/1/mode FsFmode col mode
* /1/1/1/sel/ FsDclient * /ws/1/1/sel/ FsDclient
* /1/1/1/1/ FsDclient * /ws/1/1/1/ FsDclient
* /1/1/1/name FsFname name of client * /ws/1/1/name FsFname name of client
* /1/1/1/geom FsFgeom geometry of client * /ws/1/1/tag FsFtag tag of client
* /1/1/1/ctl FsFctl command interface (client) * /ws/1/1/geom FsFgeom geometry of client
* /ws/1/1/ctl FsFctl command interface (client)
*/ */
Qid root_qid; Qid root_qid;
@ -128,13 +129,13 @@ decode_qpath(Qid *qid, unsigned char *type, int *i1, int *i2, int *i3)
case FsFdata: case FsFdata:
case FsFcolors: case FsFcolors:
case FsDlabel: *i1 = lid2index(i1id); break; case FsDlabel: *i1 = lid2index(i1id); break;
default: *i1 = pid2index(i1id); break; default: *i1 = tid2index(i1id); break;
} }
if(i2id && (*i1 != -1)) { if(i2id && (*i1 != -1)) {
*i2 = aid2index(tag[*i1], i2id); *i2 = aid2index(tag[*i1], i2id);
if(i3id && (*i2 != -1)) if(i3id && (*i2 != -1))
*i3 = frid2index(tag[*i1]->area[*i2], i3id); *i3 = frid2index(tag[*i1]->area[*i2], i3id);
} }
} }
} }
@ -142,29 +143,33 @@ static char *
qid2name(Qid *qid) qid2name(Qid *qid)
{ {
unsigned char type; unsigned char type;
int i1 = 0, i2 = 0, i3 = 0; int i1 = -1, i2 = -1, i3 = -1;
static char buf[32]; static char buf[32];
decode_qpath(qid, &type, &i1, &i2, &i3); decode_qpath(qid, &type, &i1, &i2, &i3);
if((i1 == -1) || (i2 == -1) || (i3 == -1))
return 0;
switch(type) { switch(type) {
case FsDroot: return "/"; break; case FsDroot: return "/"; break;
case FsDdef: return "def"; break; case FsDdef: return "def"; break;
case FsDkeys: return "keys"; break; case FsDkeys: return "keys"; break;
case FsDbar: return "bar"; break; case FsDbar: return "bar"; break;
case FsDtag: case FsDws:
if(i1 == -1)
return nil;
if(i1 == sel) if(i1 == sel)
return "sel"; return "sel";
snprintf(buf, sizeof(buf), "%u", i1); snprintf(buf, sizeof(buf), "%u", i1);
return buf; return buf;
break; break;
case FsDlabel: case FsDlabel:
if(i1 == -1)
return nil;
snprintf(buf, sizeof(buf), "%u", i1); snprintf(buf, sizeof(buf), "%u", i1);
return buf; return buf;
break; break;
case FsDarea: case FsDarea:
if(i1 == -1 || i2 == -1)
return nil;
if(!i2) { if(!i2) {
if(i2 == tag[i1]->sel) if(i2 == tag[i1]->sel)
return "sel"; return "sel";
@ -177,6 +182,8 @@ qid2name(Qid *qid)
return buf; return buf;
break; break;
case FsDclient: case FsDclient:
if(i1 == -1 || i2 == -1 || i3 == -1)
return nil;
if(tag[i1]->area[i2]->sel == i3) if(tag[i1]->area[i2]->sel == i3)
return "sel"; return "sel";
snprintf(buf, sizeof(buf), "%u", i3); snprintf(buf, sizeof(buf), "%u", i3);
@ -186,16 +193,45 @@ qid2name(Qid *qid)
case FsFnormcolors: return "normcolors"; break; case FsFnormcolors: return "normcolors"; break;
case FsFfont: return "font"; break; case FsFfont: return "font"; break;
case FsFcolors: return "colors"; break; case FsFcolors: return "colors"; break;
case FsFdata: return "data"; break; case FsFdata:
case FsFexpand: return "expand"; break; if(i1 == -1)
return nil;
return "data";
break;
case FsFexpand:
if(i1 == -1)
return nil;
return "expand";
break;
case FsFctl: return "ctl"; break; case FsFctl: return "ctl"; break;
case FsFborder: return "border"; break; case FsFborder: return "border"; break;
case FsFsnap: return "border"; break; case FsFsnap: return "snap"; break;
case FsFgeom: return "geometry"; break; case FsFgeom:
case FsFname: return "name"; break; if(i1 == -1 || i2 == -1 || i3 == -1)
case FsFmode: return "mode"; break; return nil;
return "geom";
break;
case FsFname:
if(i1 == -1 || i2 == -1 || i3 == -1)
return nil;
return "name";
break;
case FsFtag:
if(i1 == -1 || i2 == -1 || i3 == -1)
return nil;
return "tag";
break;
case FsFmode:
if(i1 == -1 || i2 == -1)
return nil;
return "mode";
break;
case FsFevent: return "event"; break; case FsFevent: return "event"; break;
case FsFkey: return key[i1]->name; break; case FsFkey:
if(i1 == -1)
return nil;
return key[i1]->name;
break;
default: return nil; break; default: return nil; break;
} }
} }
@ -208,7 +244,7 @@ name2type(char *name, unsigned char dir_type)
return FsDroot; return FsDroot;
if(!strncmp(name, "new", 4)) { if(!strncmp(name, "new", 4)) {
switch(dir_type) { switch(dir_type) {
case FsDroot: return FsDtag; break; case FsDroot: return FsDws; break;
case FsDbar: return FsDlabel; break; case FsDbar: return FsDlabel; break;
} }
} }
@ -226,9 +262,11 @@ name2type(char *name, unsigned char dir_type)
return FsFsnap; return FsFsnap;
if(!strncmp(name, "name", 5)) if(!strncmp(name, "name", 5))
return FsFname; return FsFname;
if(!strncmp(name, "tag", 4))
return FsFtag;
if(!strncmp(name, "border", 7)) if(!strncmp(name, "border", 7))
return FsFborder; return FsFborder;
if(!strncmp(name, "geometry", 9)) if(!strncmp(name, "geom", 5))
return FsFgeom; return FsFgeom;
if(!strncmp(name, "expand", 7)) if(!strncmp(name, "expand", 7))
return FsFexpand; return FsFexpand;
@ -254,9 +292,9 @@ name2type(char *name, unsigned char dir_type)
dyndir: dyndir:
/*fprintf(stderr, "nametotype: dir_type = %d\n", dir_type);*/ /*fprintf(stderr, "nametotype: dir_type = %d\n", dir_type);*/
switch(dir_type) { switch(dir_type) {
case FsDroot: return FsDtag; break; case FsDroot: return FsDws; break;
case FsDbar: return FsDlabel; break; case FsDbar: return FsDlabel; break;
case FsDtag: return FsDarea; break; case FsDws: return FsDarea; break;
case FsDarea: return FsDclient; break; case FsDarea: return FsDclient; break;
} }
return -1; return -1;
@ -266,12 +304,10 @@ static int
mkqid(Qid *dir, char *wname, Qid *new, Bool iswalk) mkqid(Qid *dir, char *wname, Qid *new, Bool iswalk)
{ {
unsigned char dir_type; unsigned char dir_type;
int dir_i1 = 0, dir_i2 = 0, dir_i3 = 0; int dir_i1 = -1, dir_i2 = -1, dir_i3 = -1;
int type, i; int type, i;
decode_qpath(dir, &dir_type, &dir_i1, &dir_i2, &dir_i3); decode_qpath(dir, &dir_type, &dir_i1, &dir_i2, &dir_i3);
if((dir_i1 == -1) || (dir_i2 == -1) || (dir_i3 == -1))
return -1;
type = name2type(wname, dir_type); type = name2type(wname, dir_type);
new->dir_type = dir_type; new->dir_type = dir_type;
@ -298,7 +334,7 @@ mkqid(Qid *dir, char *wname, Qid *new, Bool iswalk)
if(iswalk) if(iswalk)
new->path = mkqpath(FsDlabel, new_label()->id, 0, 0); new->path = mkqpath(FsDlabel, new_label()->id, 0, 0);
else else
new->path = mkqpath(FsDlabel, 0,0 ,0); new->path = mkqpath(FsDlabel, 0, 0 ,0);
} }
else { else {
i = cext_strtonum(wname, 0, 0xffff, &err); i = cext_strtonum(wname, 0, 0xffff, &err);
@ -307,29 +343,31 @@ mkqid(Qid *dir, char *wname, Qid *new, Bool iswalk)
new->path = mkqpath(FsDlabel, label[i]->id, 0, 0); new->path = mkqpath(FsDlabel, label[i]->id, 0, 0);
} }
break; break;
case FsDtag: case FsDws:
new->type = IXP_QTDIR; new->type = IXP_QTDIR;
if(!strncmp(wname, "new", 4)) { if(!strncmp(wname, "new", 4)) {
if(iswalk) { if(iswalk) {
Tag *p = alloc_tag(); Tag *p = alloc_tag();
new->path = mkqpath(FsDtag, p->id, 0, 0); new->path = mkqpath(FsDws, p->id, 0, 0);
} }
else else
new->path = mkqpath(FsDtag, 0, 0, 0); new->path = mkqpath(FsDws, 0, 0, 0);
} }
else if(!strncmp(wname, "sel", 4)) { else if(!strncmp(wname, "sel", 4)) {
if(!ntag) if(!ntag)
return -1; return -1;
new->path = mkqpath(FsDtag, tag[sel]->id, 0, 0); new->path = mkqpath(FsDws, tag[sel]->id, 0, 0);
} }
else { else {
i = cext_strtonum(wname, 0, 0xffff, &err); i = cext_strtonum(wname, 0, 0xffff, &err);
if(err || (i >= ntag)) if(err || (i >= ntag))
return -1; return -1;
new->path = mkqpath(FsDtag, tag[i]->id, 0, 0); new->path = mkqpath(FsDws, tag[i]->id, 0, 0);
} }
break; break;
case FsDarea: case FsDarea:
if(dir_i1 == -1)
return -1;
{ {
Tag *p = tag[dir_i1]; Tag *p = tag[dir_i1];
new->type = IXP_QTDIR; new->type = IXP_QTDIR;
@ -345,6 +383,8 @@ mkqid(Qid *dir, char *wname, Qid *new, Bool iswalk)
} }
break; break;
case FsDclient: case FsDclient:
if(dir_i1 == -1 || dir_i2 == -1)
return -1;
{ {
Tag *p = tag[dir_i1]; Tag *p = tag[dir_i1];
Area *a = p->area[dir_i2]; Area *a = p->area[dir_i2];
@ -373,8 +413,25 @@ mkqid(Qid *dir, char *wname, Qid *new, Bool iswalk)
break; break;
case FsFdata: case FsFdata:
case FsFcolors: case FsFcolors:
if((dir_type == FsDlabel) && (dir_i1 >= nlabel)) if((dir_type == FsDlabel) && (dir_i1 == -1))
return -1; return -1;
new->type = IXP_QTFILE;
new->path = mkqpath(type, qpath_i1id(dir->path), qpath_i2id(dir->path), qpath_i3id(dir->path));
break;
case FsFmode:
if(dir_i1 == -1 || dir_i2 == -1)
return -1;
new->type = IXP_QTFILE;
new->path = mkqpath(type, qpath_i1id(dir->path), qpath_i2id(dir->path), qpath_i3id(dir->path));
break;
case FsFgeom:
case FsFname:
case FsFtag:
if(dir_i1 == -1 || dir_i2 == -1 || dir_i3 == -1)
return -1;
new->type = IXP_QTFILE;
new->path = mkqpath(type, qpath_i1id(dir->path), qpath_i2id(dir->path), qpath_i3id(dir->path));
break;
default: default:
new->type = IXP_QTFILE; new->type = IXP_QTFILE;
new->path = mkqpath(type, qpath_i1id(dir->path), qpath_i2id(dir->path), qpath_i3id(dir->path)); new->path = mkqpath(type, qpath_i1id(dir->path), qpath_i2id(dir->path), qpath_i3id(dir->path));
@ -521,7 +578,7 @@ type2stat(Stat *stat, char *wname, Qid *dir)
switch (type) { switch (type) {
case FsDclient: case FsDclient:
case FsDarea: case FsDarea:
case FsDtag: case FsDws:
case FsDdef: case FsDdef:
case FsDkeys: case FsDkeys:
case FsDbar: case FsDbar:
@ -551,6 +608,10 @@ type2stat(Stat *stat, char *wname, Qid *dir)
f = tag[dir_i1]->area[dir_i2]->frame[dir_i3]; f = tag[dir_i1]->area[dir_i2]->frame[dir_i3];
return mkstat(stat, dir, wname, strlen(f->client->name), DMREAD); return mkstat(stat, dir, wname, strlen(f->client->name), DMREAD);
break; break;
case FsFtag:
f = tag[dir_i1]->area[dir_i2]->frame[dir_i3];
return mkstat(stat, dir, wname, strlen(f->client->tag), DMREAD | DMWRITE);
break;
case FsFkey: case FsFkey:
return mkstat(stat, dir, wname, 0, DMWRITE); return mkstat(stat, dir, wname, 0, DMWRITE);
break; break;
@ -589,7 +650,7 @@ xremove(IXPConn *c, Fcall *fcall)
if((i1 == -1) || (i2 == -1) || (i3 == -1)) if((i1 == -1) || (i2 == -1) || (i3 == -1))
return Enofile; return Enofile;
switch(type) { switch(type) {
case FsDtag: case FsDws:
if((ret = destroy_tag(tag[i1]))) if((ret = destroy_tag(tag[i1])))
return ret; return ret;
break; break;
@ -714,7 +775,7 @@ xread(IXPConn *c, Fcall *fcall)
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
} }
break; break;
case FsDtag: case FsDws:
/* jump to offset */ /* jump to offset */
len = type2stat(&stat, "ctl", &m->qid); len = type2stat(&stat, "ctl", &m->qid);
for(i = 0; i < tag[i1]->narea; i++) { for(i = 0; i < tag[i1]->narea; i++) {
@ -847,7 +908,7 @@ xread(IXPConn *c, Fcall *fcall)
fcall->count += type2stat(&stat, "font", &m->qid); fcall->count += type2stat(&stat, "font", &m->qid);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
break; break;
case FsDtag: case FsDws:
fcall->count = type2stat(&stat, "ctl", &m->qid); fcall->count = type2stat(&stat, "ctl", &m->qid);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
for(i = 0; i < tag[i1]->narea; i++) { for(i = 0; i < tag[i1]->narea; i++) {
@ -881,11 +942,11 @@ xread(IXPConn *c, Fcall *fcall)
} }
break; break;
case FsDclient: case FsDclient:
fcall->count = type2stat(&stat, "border", &m->qid);
p = ixp_enc_stat(p, &stat);
fcall->count += type2stat(&stat, "name", &m->qid); fcall->count += type2stat(&stat, "name", &m->qid);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
fcall->count += type2stat(&stat, "geometry", &m->qid); fcall->count += type2stat(&stat, "tag", &m->qid);
p = ixp_enc_stat(p, &stat);
fcall->count += type2stat(&stat, "geom", &m->qid);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
fcall->count += type2stat(&stat, "ctl", &m->qid); fcall->count += type2stat(&stat, "ctl", &m->qid);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
@ -919,6 +980,10 @@ xread(IXPConn *c, Fcall *fcall)
if((fcall->count = strlen(tag[i1]->area[i2]->frame[i3]->client->name))) if((fcall->count = strlen(tag[i1]->area[i2]->frame[i3]->client->name)))
memcpy(p, tag[i1]->area[i2]->frame[i3]->client->name, fcall->count); memcpy(p, tag[i1]->area[i2]->frame[i3]->client->name, fcall->count);
break; break;
case FsFtag:
if((fcall->count = strlen(tag[i1]->area[i2]->frame[i3]->client->tag)))
memcpy(p, tag[i1]->area[i2]->frame[i3]->client->tag, fcall->count);
break;
case FsFexpand: case FsFexpand:
snprintf(buf, sizeof(buf), "%u", iexpand); snprintf(buf, sizeof(buf), "%u", iexpand);
fcall->count = strlen(buf); fcall->count = strlen(buf);
@ -1016,7 +1081,7 @@ xwrite(IXPConn *c, Fcall *fcall)
else else
return Enocommand; return Enocommand;
break; break;
case FsDtag: case FsDws:
if(!strncmp(buf, "select ", 7)) if(!strncmp(buf, "select ", 7))
select_area(tag[i1]->area[tag[i1]->sel], &buf[7]); select_area(tag[i1]->area[tag[i1]->sel], &buf[7]);
break; break;
@ -1061,6 +1126,13 @@ xwrite(IXPConn *c, Fcall *fcall)
def.border = i; def.border = i;
resize_all_clients(); resize_all_clients();
break; break;
case FsFtag:
f = tag[i1]->area[i2]->frame[i3];
if(fcall->count > sizeof(f->client->tag))
return "tag value too long";
memcpy(f->client->tag, fcall->data, fcall->count);
/* TODO: update_tags */
break;
case FsFgeom: case FsFgeom:
f = tag[i1]->area[i2]->frame[i3]; f = tag[i1]->area[i2]->frame[i3];
if(fcall->count > sizeof(buf)) if(fcall->count > sizeof(buf))

2
cmd/wm/tag.c
View File

@ -120,7 +120,7 @@ rectangles(unsigned int *num)
} }
int int
pid2index(unsigned short id) tid2index(unsigned short id)
{ {
int i; int i;
for(i = 0; i < ntag; i++) for(i = 0; i < ntag; i++)

7
cmd/wm/wm.h
View File

@ -53,7 +53,7 @@ enum {
enum { enum {
FsDroot, FsDroot,
FsDdef, FsDdef,
FsDtag, FsDws,
FsDarea, FsDarea,
FsDclient, FsDclient,
FsDkeys, FsDkeys,
@ -73,6 +73,7 @@ enum {
FsFevent, FsFevent,
FsFctl, FsFctl,
FsFname, FsFname,
FsFtag,
FsFmode FsFmode
}; };
@ -117,7 +118,7 @@ struct Frame {
struct Client { struct Client {
char name[256]; char name[256];
char tags[256]; char tag[256];
int proto; int proto;
unsigned int border; unsigned int border;
Bool destroyed; Bool destroyed;
@ -284,7 +285,7 @@ Tag *alloc_tag();
char *destroy_tag(Tag *t); char *destroy_tag(Tag *t);
void focus_tag(Tag *t); void focus_tag(Tag *t);
XRectangle *rectangles(unsigned int *num); XRectangle *rectangles(unsigned int *num);
int pid2index(unsigned short id); int tid2index(unsigned short id);
void select_tag(char *arg); void select_tag(char *arg);
int tag2index(Tag *t); int tag2index(Tag *t);