home
/
code
/
khatus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c5d1af8
)
Rename "file" to "fifo"
author
Siraaj Khandkar
<siraaj@khandkar.net>
Tue, 10 Mar 2020 07:14:09 +0000
(
03:14
-0400)
committer
Siraaj Khandkar
<siraaj@khandkar.net>
Tue, 10 Mar 2020 07:14:09 +0000
(
03:14
-0400)
x5/khatus.c
patch
|
blob
|
blame
|
history
diff --git
a/x5/khatus.c
b/x5/khatus.c
index
bdf2c1d
..
4acb956
100644
(file)
--- a/
x5/khatus.c
+++ b/
x5/khatus.c
@@
-20,40
+20,40
@@
char *argv0;
char *argv0;
-/* TODO: Convert fi
le list to file
array. */
-typedef struct Fi
le File
;
-struct Fi
le
{
+/* TODO: Convert fi
fo list to fifo
array. */
+typedef struct Fi
fo Fifo
;
+struct Fi
fo
{
char *name;
int fd;
int width;
int last_read;
int ttl;
int pos; /* Position on the output buffer. */
char *name;
int fd;
int width;
int last_read;
int ttl;
int pos; /* Position on the output buffer. */
- Fi
le
*next;
+ Fi
fo
*next;
};
typedef struct Config Config;
struct Config {
int interval;
char * separator;
};
typedef struct Config Config;
struct Config {
int interval;
char * separator;
- Fi
le * file
s;
- int fi
le
_count;
+ Fi
fo * fifo
s;
+ int fi
fo
_count;
int total_width;
int output_to_x_root_window;
} defaults = {
.interval = 1,
.separator = "|",
int total_width;
int output_to_x_root_window;
} defaults = {
.interval = 1,
.separator = "|",
- .fi
le
s = NULL,
- .fi
le
_count = 0,
+ .fi
fo
s = NULL,
+ .fi
fo
_count = 0,
.total_width = 0,
.output_to_x_root_window = 0,
};
void
.total_width = 0,
.output_to_x_root_window = 0,
};
void
-fi
le_print_one(File
*f)
+fi
fo_print_one(Fifo
*f)
{
debug(
{
debug(
- "Fi
le
"
+ "Fi
fo
"
"{"
" name = %s,"
" fd = %d,"
"{"
" name = %s,"
" fd = %d,"
@@
-74,10
+74,10
@@
file_print_one(File *f)
}
void
}
void
-fi
le_print_all(File
*head)
+fi
fo_print_all(Fifo
*head)
{
{
- for (Fi
le
*f = head; f; f = f->next) {
- fi
le
_print_one(f);
+ for (Fi
fo
*f = head; f; f = f->next) {
+ fi
fo
_print_one(f);
}
}
}
}
@@
-89,16
+89,16
@@
config_print(Config *c)
"{"
" interval = %d,"
" separator = %s,"
"{"
" interval = %d,"
" separator = %s,"
- " fi
le
_count = %d,"
+ " fi
fo
_count = %d,"
" total_width = %d,"
" total_width = %d,"
- " fi
le
s = ..."
+ " fi
fo
s = ..."
" }\n",
c->interval,
c->separator,
" }\n",
c->interval,
c->separator,
- c->fi
le
_count,
+ c->fi
fo
_count,
c->total_width
);
c->total_width
);
- fi
le_print_all(c->file
s);
+ fi
fo_print_all(c->fifo
s);
}
int
}
int
@@
-188,17
+188,17
@@
void
parse_opts_spec(Config *cfg, int argc, char *argv[], int i)
{
if ((i + 3) > argc)
parse_opts_spec(Config *cfg, int argc, char *argv[], int i)
{
if ((i + 3) > argc)
- usage("[spec] Parameter(s) missing for fi
le
\"%s\".\n", argv[i]);
+ usage("[spec] Parameter(s) missing for fi
fo
\"%s\".\n", argv[i]);
char *n = argv[i++];
char *w = argv[i++];
char *t = argv[i++];
if (!is_pos_num(w))
char *n = argv[i++];
char *w = argv[i++];
char *t = argv[i++];
if (!is_pos_num(w))
- usage("[spec] Invalid width: \"%s\", for fi
le
\"%s\"\n", w, n);
+ usage("[spec] Invalid width: \"%s\", for fi
fo
\"%s\"\n", w, n);
if (!is_pos_num(t))
if (!is_pos_num(t))
- usage("[spec] Invalid TTL: \"%s\", for fi
le
\"%s\"\n", t, n);
- Fi
le *f = calloc(1, sizeof(struct File
));
+ usage("[spec] Invalid TTL: \"%s\", for fi
fo
\"%s\"\n", t, n);
+ Fi
fo *f = calloc(1, sizeof(struct Fifo
));
if (f) {
f->name = n;
f->fd = -1;
if (f) {
f->name = n;
f->fd = -1;
@@
-206,11
+206,11
@@
parse_opts_spec(Config *cfg, int argc, char *argv[], int i)
f->ttl = atoi(t);
f->last_read = 0;
f->pos = cfg->total_width;
f->ttl = atoi(t);
f->last_read = 0;
f->pos = cfg->total_width;
- f->next = cfg->fi
le
s;
+ f->next = cfg->fi
fo
s;
- cfg->fi
le
s = f;
+ cfg->fi
fo
s = f;
cfg->total_width += f->width;
cfg->total_width += f->width;
- cfg->fi
le
_count++;
+ cfg->fi
fo
_count++;
} else {
fatal("[memory] Allocation failure.");
}
} else {
fatal("[memory] Allocation failure.");
}
@@
-233,18
+233,18
@@
opts_parse(Config *cfg, int argc, char *argv[])
{
opts_parse_any(cfg, argc, argv, 1);
{
opts_parse_any(cfg, argc, argv, 1);
- Fi
le *last = cfg->file
s;
- cfg->fi
le
s = NULL;
- for (Fi
le
*f = last; f; ) {
- Fi
le
*next = f->next;
- f->next = cfg->fi
le
s;
- cfg->fi
le
s = f;
+ Fi
fo *last = cfg->fifo
s;
+ cfg->fi
fo
s = NULL;
+ for (Fi
fo
*f = last; f; ) {
+ Fi
fo
*next = f->next;
+ f->next = cfg->fi
fo
s;
+ cfg->fi
fo
s = f;
f = next;
}
}
void
f = next;
}
}
void
-read_one(Fi
le
*f, char *buf)
+read_one(Fi
fo
*f, char *buf)
{
ssize_t current;
ssize_t total;
{
ssize_t current;
ssize_t total;
@@
-275,7
+275,7
@@
read_all(Config *cfg, char *buf)
FD_ZERO(&fds);
/* TODO: Check TTL */
FD_ZERO(&fds);
/* TODO: Check TTL */
- for (Fi
le *f = cfg->file
s; f; f = f->next) {
+ for (Fi
fo *f = cfg->fifo
s; f; f = f->next) {
/* TODO: Create the FIFO if it doesn't already exist. */
if (lstat(f->name, &st) < 0)
fatal("Cannot stat \"%s\". Error: %s\n", f->name, strerror(errno));
/* TODO: Create the FIFO if it doesn't already exist. */
if (lstat(f->name, &st) < 0)
fatal("Cannot stat \"%s\". Error: %s\n", f->name, strerror(errno));
@@
-285,7
+285,7
@@
read_all(Config *cfg, char *buf)
if (f->fd < 0)
f->fd = open(f->name, O_RDONLY | O_NONBLOCK);
if (f->fd == -1)
if (f->fd < 0)
f->fd = open(f->name, O_RDONLY | O_NONBLOCK);
if (f->fd == -1)
- /* TODO: Consider backing off retries for failed fi
le
s. */
+ /* TODO: Consider backing off retries for failed fi
fo
s. */
fatal("Failed to open \"%s\"\n", f->name);
if (f->fd > maxfd)
maxfd = f->fd;
fatal("Failed to open \"%s\"\n", f->name);
if (f->fd > maxfd)
maxfd = f->fd;
@@
-297,7
+297,7
@@
read_all(Config *cfg, char *buf)
assert(ready != 0);
if (ready < 0)
fatal("%s", strerror(errno));
assert(ready != 0);
if (ready < 0)
fatal("%s", strerror(errno));
- for (Fi
le *f = cfg->file
s; f; f = f->next) {
+ for (Fi
fo *f = cfg->fifo
s; f; f = f->next) {
if (FD_ISSET(f->fd, &fds)) {
debug("reading: %s\n", f->name);
read_one(f, buf);
if (FD_ISSET(f->fd, &fds)) {
debug("reading: %s\n", f->name);
read_one(f, buf);
@@
-309,7
+309,7
@@
int
main(int argc, char *argv[])
{
int width;
main(int argc, char *argv[])
{
int width;
- int nfi
le
s = 0;
+ int nfi
fo
s = 0;
int seplen;
int prefix = 0;
char *buf;
int seplen;
int prefix = 0;
char *buf;
@@
-321,26
+321,26
@@
main(int argc, char *argv[])
opts_parse(cfg, argc, argv);
debug("argv0 = %s\n", argv0);
config_print(cfg);
opts_parse(cfg, argc, argv);
debug("argv0 = %s\n", argv0);
config_print(cfg);
- if (cfg->fi
le
s == NULL)
- usage("No fi
le
specs were given!\n");
+ if (cfg->fi
fo
s == NULL)
+ usage("No fi
fo
specs were given!\n");
width = cfg->total_width;
seplen = strlen(cfg->separator);
/* 1st pass to make space for separators */
width = cfg->total_width;
seplen = strlen(cfg->separator);
/* 1st pass to make space for separators */
- for (Fi
le *f = cfg->file
s; f; f = f->next) {
+ for (Fi
fo *f = cfg->fifo
s; f; f = f->next) {
f->pos += prefix;
prefix += seplen;
f->pos += prefix;
prefix += seplen;
- nfi
le
s++;
+ nfi
fo
s++;
}
}
- width += (seplen * (nfi
le
s - 1));
+ width += (seplen * (nfi
fo
s - 1));
buf = calloc(1, width + 1);
if (buf == NULL)
fatal("[memory] Failed to allocate buffer of %d bytes", width);
memset(buf, ' ', width);
buf[width] = '\0';
/* 2nd pass to set the separators */
buf = calloc(1, width + 1);
if (buf == NULL)
fatal("[memory] Failed to allocate buffer of %d bytes", width);
memset(buf, ' ', width);
buf[width] = '\0';
/* 2nd pass to set the separators */
- for (Fi
le *f = cfg->file
s; f; f = f->next) {
+ for (Fi
fo *f = cfg->fifo
s; f; f = f->next) {
if (f->pos) { /* Skip the first, left-most */
/* Copying only seplen ensures we omit the '\0' byte. */
strncpy(buf + (f->pos - seplen), cfg->separator, seplen);
if (f->pos) { /* Skip the first, left-most */
/* Copying only seplen ensures we omit the '\0' byte. */
strncpy(buf + (f->pos - seplen), cfg->separator, seplen);
This page took
0.0255 seconds
and
4
git commands to generate.