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

added qsort to xls in wmiir2

Browse Source
This commit is contained in:
Anselm R. Garbe 2006-01-21 15:08:34 +02:00
parent 7736b32121
commit 04d570026a
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/wmiibar2.c
View File

@ -260,10 +260,7 @@ xwalk(IXPServer * s, IXPConn * c)
return -1;
}
}
/*
* following condition is required by 9P, a fid will only be valid if
* the walk was complete
*/
/* a fid will only be valid, if the walk was complete */
if(nwqid == s->fcall.nwname) {
Map *m, *maps = c->aux;
if(s->fcall.fid == s->fcall.newfid) {
@ -353,6 +350,12 @@ xread(IXPServer * s, IXPConn * c)
s->fcall.count += mkstat(&stat, "default", 0, DMDIR);
p = ixp_enc_stat(p, &stat);
/* todo: add all labels */
s->fcall.count += mkstat(&stat, "1", 0, DMDIR);
p = ixp_enc_stat(p, &stat);
s->fcall.count += mkstat(&stat, "2", 0, DMDIR);
p = ixp_enc_stat(p, &stat);
s->fcall.count += mkstat(&stat, "3", 0, DMDIR);
p = ixp_enc_stat(p, &stat);
s->fcall.id = RREAD;
if(s->fcall.offset >= s->fcall.count)
s->fcall.count = 0; /* EOF */

18
cmd/wmiir2.c
View File

@ -7,6 +7,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <dirent.h>
#include "../libixp2/ixp.h"
@ -90,19 +91,28 @@ xwrite(char *file)
}
static void
print_dir(void *result, unsigned int msize)
xls(void *result, unsigned int msize)
{
static char *dir[IXP_MAX_MSG];
size_t i = 0, j;
char buf[IXP_MAX_MSG];
void *p = result;
static Stat stat, zerostat = { 0 };
do {
p = ixp_dec_stat(p, &stat);
if(stat.qid.type == IXP_QTDIR)
fprintf(stdout, "%s/\n", stat.name);
snprintf(buf, IXP_MAX_MSG, "%s/", stat.name);
else
fprintf(stdout, "%s\n", stat.name);
snprintf(buf, IXP_MAX_MSG, "%s", stat.name);
dir[i++] = cext_estrdup(buf);
stat = zerostat;
}
while(p - result < msize);
qsort(dir, i, sizeof(char *), alphasort);
for(j = 0; j < i; j++) {
fprintf(stdout, "%s\n", dir[j]);
free(dir[j]);
}
}
static int
@ -123,7 +133,7 @@ xread(char *file)
/* read */
while((count = ixp_client_read(&c, fid, offset, result, IXP_MAX_MSG)) > 0) {
if(is_directory)
print_dir(result, count);
xls(result, count);
else {
unsigned int i;
for(i = 0; i < count; i++)