tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-25 23:05:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix powerline.c styling

Browse Source 
Also makes it compile with -std=c89 (except for snprintf) or just -std=c99,
-Wall, -pedantic.
This commit is contained in:
ZyX 2014-08-04 02:11:19 +04:00
parent 088d1f0f58
commit a5037a817b
1 changed files with 52 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
client/powerline.c
View File

@ -8,72 +8,82 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <string.h>
#define handle_error(msg) \ #define HANDLE_ERROR(msg) \
do { perror(msg); exit(EXIT_FAILURE); } while (0) do { \
perror(msg); exit(EXIT_FAILURE); \
} while (0)
#ifndef TEMP_FAILURE_RETRY #define TEMP_FAILURE_RETRY(var, expression) \
#define TEMP_FAILURE_RETRY(expression) \ do { \
( \ long int __result; \
({ long int __result; \ do { \
do __result = (long int) (expression); \ __result = (long int) (expression); \
while (__result == -1L && errno == EINTR); \ } while (__result == -1L && errno == EINTR); \
__result; })) var = __result; \
#endif } while (0)
extern char **environ; extern char **environ;
void do_write(int sd, const char *raw, int len) { void do_write(int sd, const char *raw, int len) {
int written = 0, n = -1; int written = 0;
int n = -1;
while (written < len) { while (written < len) {
n = TEMP_FAILURE_RETRY(write(sd, raw+written, len-written)); TEMP_FAILURE_RETRY(n, write(sd, raw + written, len - written));
if (n == -1) { if (n == -1) {
close(sd); close(sd);
handle_error("write() failed"); HANDLE_ERROR("write() failed");
} }
written += n; written += n;
} }
} }
#ifdef __APPLE__
# define ADDRESS_TEMPLATE "/tmp/powerline-ipc-%d"
# define A
#else
# define ADDRESS_TEMPLATE "powerline-ipc-%d"
# define A +1
#endif
#define ADDRESS_SIZE sizeof(ADDRESS_TEMPLATE) + (sizeof(uid_t) * 4)
#define NUM_ARGS_SIZE (sizeof(int) * 2)
#define BUF_SIZE 4096
#define NEW_ARGV_SIZE 200
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int sd = -1, i; int sd = -1;
int i;
struct sockaddr_un server; struct sockaddr_un server;
char address[50] = {}; char address[ADDRESS_SIZE];
const char eof[2] = "\0\0"; const char eof[2] = "\0\0";
char buf[4096] = {}; char buf[BUF_SIZE];
char *newargv[200] = {}; char *newargv[NEW_ARGV_SIZE];
char *wd = NULL; char *wd = NULL;
char **envp; char **envp;
if (argc < 2) { printf("Must provide at least one argument.\n"); return EXIT_FAILURE; } if (argc < 2) {
printf("Must provide at least one argument.\n"); return EXIT_FAILURE;
}
#ifdef __APPLE__ snprintf(address, ADDRESS_SIZE, ADDRESS_TEMPLATE, getuid());
snprintf(address, 50, "/tmp/powerline-ipc-%d", getuid());
#else
snprintf(address, 50, "powerline-ipc-%d", getuid());
#endif
sd = socket(AF_UNIX, SOCK_STREAM, 0); sd = socket(AF_UNIX, SOCK_STREAM, 0);
if (sd == -1) handle_error("socket() failed"); if (sd == -1)
HANDLE_ERROR("socket() failed");
memset(&server, 0, sizeof(struct sockaddr_un)); // Clear memset(&server, 0, sizeof(struct sockaddr_un));
server.sun_family = AF_UNIX; server.sun_family = AF_UNIX;
#ifdef __APPLE__ strncpy(server.sun_path A, address, strlen(address));
strncpy(server.sun_path, address, strlen(address));
#else
strncpy(server.sun_path+1, address, strlen(address));
#endif
#ifdef __APPLE__ if (connect(sd, (struct sockaddr *) &server, sizeof(server.sun_family) + strlen(address) A) < 0) {
if (connect(sd, (struct sockaddr *) &server, sizeof(server.sun_family) + strlen(address)) < 0) {
#else
if (connect(sd, (struct sockaddr *) &server, sizeof(server.sun_family) + strlen(address)+1) < 0) {
#endif
close(sd); close(sd);
// We failed to connect to the daemon, execute powerline instead /* We failed to connect to the daemon, execute powerline instead */
argc = (argc < 199) ? argc : 199; argc = (argc < NEW_ARGV_SIZE - 1) ? argc : NEW_ARGV_SIZE - 1;
for (i=1; i < argc; i++) newargv[i] = argv[i]; for (i = 1; i < argc; i++)
newargv[i] = argv[i];
newargv[0] = "powerline-render"; newargv[0] = "powerline-render";
newargv[argc] = NULL; newargv[argc] = NULL;
execvp("powerline-render", newargv); execvp("powerline-render", newargv);
@ -101,13 +111,13 @@ int main(int argc, char *argv[]) {
i = -1; i = -1;
while (i != 0) { while (i != 0) {
i = TEMP_FAILURE_RETRY(read(sd, buf, 4096)); TEMP_FAILURE_RETRY(i, read(sd, buf, BUF_SIZE));
if (i == -1) { if (i == -1) {
close(sd); close(sd);
handle_error("read() failed"); HANDLE_ERROR("read() failed");
} else if (i > 0) {
(void) write(STDOUT_FILENO, buf, i);
} }
if (i > 0)
write(STDOUT_FILENO, buf, i) || 0;
} }
close(sd); close(sd);