annotate util.c @ 20:4560e0882c1d

made code more readable
author Anselm R. Garbe <garbeam@wmii.de>
date Tue, 11 Jul 2006 22:49:09 +0200
parents 359b6e563b95
children 2e0fb4130bfb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
1 /*
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
2 * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
3 * See LICENSE file for license details.
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
4 */
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
5
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
6 #include <stdarg.h>
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
7 #include <stdio.h>
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
8 #include <stdlib.h>
3
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
9 #include <string.h>
5
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
10 #include <sys/types.h>
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
11 #include <sys/wait.h>
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
12 #include <unistd.h>
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
13
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
14 #include "util.h"
2
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
15
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
16 void
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
17 error(char *errstr, ...) {
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
18 va_list ap;
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
19 va_start(ap, errstr);
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
20 vfprintf(stderr, errstr, ap);
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
21 va_end(ap);
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
22 exit(1);
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
23 }
a79188fe4a40 added new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
24
3
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
25 static void
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
26 bad_malloc(unsigned int size)
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
27 {
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
28 fprintf(stderr, "fatal: could not malloc() %d bytes\n",
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
29 (int) size);
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
30 exit(1);
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
31 }
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
32
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
33 void *
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
34 emallocz(unsigned int size)
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
35 {
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
36 void *res = calloc(1, size);
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
37 if(!res)
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
38 bad_malloc(size);
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
39 return res;
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
40 }
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
41
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
42 void *
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
43 emalloc(unsigned int size)
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
44 {
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
45 void *res = malloc(size);
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
46 if(!res)
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
47 bad_malloc(size);
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
48 return res;
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
49 }
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
50
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
51 void *
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
52 erealloc(void *ptr, unsigned int size)
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
53 {
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
54 void *res = realloc(ptr, size);
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
55 if(!res)
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
56 bad_malloc(size);
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
57 return res;
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
58 }
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
59
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
60 char *
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
61 estrdup(const char *str)
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
62 {
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
63 void *res = strdup(str);
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
64 if(!res)
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
65 bad_malloc(strlen(str));
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
66 return res;
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
67 }
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
68
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
69 void
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
70 failed_assert(char *a, char *file, int line)
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
71 {
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
72 fprintf(stderr, "Assertion \"%s\" failed at %s:%d\n", a, file, line);
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
73 abort();
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
74 }
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
75
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
76 void
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
77 swap(void **p1, void **p2)
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
78 {
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
79 void *tmp = *p1;
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
80 *p1 = *p2;
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
81 *p2 = tmp;
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
82 }
5
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
83
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
84 void
14
5c078b66347b added bar event timer
Anselm R. Garbe <garbeam@wmii.de>
parents: 11
diff changeset
85 spawn(Display *dpy, char *argv[])
5
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
86 {
14
5c078b66347b added bar event timer
Anselm R. Garbe <garbeam@wmii.de>
parents: 11
diff changeset
87 if(!argv || !argv[0])
5
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
88 return;
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
89 if(fork() == 0) {
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
90 if(fork() == 0) {
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
91 if(dpy)
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
92 close(ConnectionNumber(dpy));
9
d567f430a81d fixed several stuff (gridwm gets better and better)
Anselm R. Garbe <garbeam@wmii.de>
parents: 6
diff changeset
93 setsid();
14
5c078b66347b added bar event timer
Anselm R. Garbe <garbeam@wmii.de>
parents: 11
diff changeset
94 execvp(argv[0], argv);
5c078b66347b added bar event timer
Anselm R. Garbe <garbeam@wmii.de>
parents: 11
diff changeset
95 fprintf(stderr, "gridwm: execvp %s", argv[0]);
5
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
96 perror(" failed");
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
97 }
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
98 exit (0);
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
99 }
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
100 wait(0);
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
101 }
6
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
102
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
103 void
14
5c078b66347b added bar event timer
Anselm R. Garbe <garbeam@wmii.de>
parents: 11
diff changeset
104 pipe_spawn(char *buf, unsigned int len, Display *dpy, char *argv[])
6
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
105 {
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
106 unsigned int l, n;
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
107 int pfd[2];
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
108
14
5c078b66347b added bar event timer
Anselm R. Garbe <garbeam@wmii.de>
parents: 11
diff changeset
109 if(!argv || !argv[0])
6
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
110 return;
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
111
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
112 if(pipe(pfd) == -1) {
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
113 perror("pipe");
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
114 exit(1);
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
115 }
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
116
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
117 if(fork() == 0) {
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
118 if(dpy)
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
119 close(ConnectionNumber(dpy));
9
d567f430a81d fixed several stuff (gridwm gets better and better)
Anselm R. Garbe <garbeam@wmii.de>
parents: 6
diff changeset
120 setsid();
6
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
121 dup2(pfd[1], STDOUT_FILENO);
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
122 close(pfd[0]);
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
123 close(pfd[1]);
14
5c078b66347b added bar event timer
Anselm R. Garbe <garbeam@wmii.de>
parents: 11
diff changeset
124 execvp(argv[0], argv);
5c078b66347b added bar event timer
Anselm R. Garbe <garbeam@wmii.de>
parents: 11
diff changeset
125 fprintf(stderr, "gridwm: execvp %s", argv[0]);
6
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
126 perror(" failed");
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
127 }
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
128 else {
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
129 n = 0;
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
130 close(pfd[1]);
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
131 while(l > n) {
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
132 if((l = read(pfd[0], buf + n, len - n)) < 1)
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
133 break;
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
134 n += l;
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
135 }
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
136 close(pfd[0]);
16
359b6e563b95 several changes, new stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 15
diff changeset
137 buf[n < len ? n : len - 1] = 0;
6
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
138 }
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
139 wait(0);
e0cefb3981c8 implemented pipe_spawn
Anselm R. Garbe <garbeam@wmii.de>
parents: 5
diff changeset
140 }