/*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/wait.h>
-#include <signal.h>
-#include <sys/signal.h>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <time.h> /* time(), localtime() */
#include <unistd.h>
#include <errno.h>
#include <limits.h>
#include <stdarg.h>
-#include <stropts.h>
-#include <poll.h>
-#include <sys/socket.h>
+#include <ctype.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <ctype.h>
+#include <sys/socket.h>
#include <sys/un.h> /* needed by create_pf_socket */
+#include <string.h>
#include "gcc-compat.h"
/* some internal constants */
#define MAXLINE 255
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define ABS(a) ((a) > 0 ? (a) : -(a))
+#define PARA_MIN(a,b) ((a) < (b) ? (a) : (b))
+#define PARA_MAX(a,b) ((a) > (b) ? (a) : (b))
+#define PARA_ABS(a) ((a) > 0 ? (a) : -(a))
/* Loglevels */
#define DEBUG 1
#if DEBUG > COMPILE_TIME_LOGLEVEL
#define PARA_DEBUG_LOG(f,...) para_log(DEBUG, "%s: " f, __FUNCTION__, __VA_ARGS__)
#else
-#define PARA_DEBUG_LOG(...)
+#define PARA_DEBUG_LOG(...) do {;} while (0)
#endif
#if INFO > COMPILE_TIME_LOGLEVEL
#define PARA_INFO_LOG(f,...) para_log(INFO, "%s: " f, __FUNCTION__, __VA_ARGS__)
#else
-#define PARA_INFO_LOG(...)
+#define PARA_INFO_LOG(...) do {;} while (0)
#endif
#if NOTICE > COMPILE_TIME_LOGLEVEL
#define PARA_NOTICE_LOG(f,...) para_log(NOTICE, "%s: " f, __FUNCTION__, __VA_ARGS__)
#else
-#define PARA_NOTICE_LOG(...)
+#define PARA_NOTICE_LOG(...) do {;} while (0)
#endif
#if WARNING > COMPILE_TIME_LOGLEVEL
#define PARA_WARNING_LOG(f,...) para_log(WARNING, "%s: " f, __FUNCTION__, __VA_ARGS__)
#else
-#define PARA_WARNING_LOG(...)
+#define PARA_WARNING_LOG(...) do {;} while (0)
#endif
#if ERROR > COMPILE_TIME_LOGLEVEL
#define PARA_ERROR_LOG(f,...) para_log(ERROR, "%s: " f, __FUNCTION__, __VA_ARGS__)
#else
-#define PARA_ERROR_LOG(...)
+#define PARA_ERROR_LOG(...) do {;} while (0)
#endif
#if CRIT > COMPILE_TIME_LOGLEVEL
#define PARA_CRIT_LOG(f,...) para_log(CRIT, "%s: " f, __FUNCTION__, __VA_ARGS__)
#else
-#define PARA_CRIT_LOG(...)
+#define PARA_CRIT_LOG(...) do {;} while (0)
#endif
#if EMERG > COMPILE_TIME_LOGLEVEL
#define PARA_EMERG_LOG(...)
#endif
+/**
+ * define a standard log function that always writes to stderr
+ *
+ * \param loglevel_barier If the loglevel of the current message
+ * is less than that, the message is going to be ignored.
+ *
+ */
+#define INIT_STDERR_LOGGING(loglevel_barrier) \
+ __printf_2_3 void para_log(int ll, const char* fmt,...) \
+ { \
+ va_list argp; \
+ if (ll < loglevel_barrier) \
+ return; \
+ va_start(argp, fmt); \
+ vfprintf(stderr, fmt, argp); \
+ va_end(argp); \
+ }
+
+
#define COPYRIGHT "Copyright (c) 1997-2006 by Andre Noll"
#define LICENSE "This is free software with ABSOLUTELY NO WARRANTY. " \
int read_audiod_pipe(int, void (*)(char *));
/* exec */
-int file_exists(const char *);
-int para_exec(pid_t *, const char *, char *const [], int *);
-int para_exec_cmdline_pid(pid_t *, char *, int *);
-
-/* signal */
-int para_signal_init(void);
-int para_install_sighandler(int);
-void para_reap_children(void);
-pid_t para_reap_child(void);
-int para_next_signal(void);
+int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds);
/* time */
int tv_diff(const struct timeval *b, const struct timeval *a, struct timeval *diff);
void d2tv(double, struct timeval*);
void tv_add(const struct timeval*, const struct timeval *, struct timeval *);
void tv_scale(const unsigned long, const struct timeval *, struct timeval *);
-void tv_divide(const unsigned long div, const struct timeval *tv,
+void tv_divide(const unsigned long divisor, const struct timeval *tv,
struct timeval *result);
int tv_convex_combination(const long a, const struct timeval *tv1,
const long b, const struct timeval *tv2,
SI_AUDIOD_UPTIME, SI_SELECTOR, NUM_STAT_ITEMS
};
+int stat_item_valid(const char *item);
int stat_line_valid(const char *);
-void stat_client_write(char *msg);
-int stat_client_add(int);
-void dump_empty_status(void);
+void stat_client_write(char *msg, int itemnum);
+int stat_client_add(int fd, long unsigned mask);
unsigned for_each_line(char *, int, void (*)(char *));
+#define FOR_EACH_STAT_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++)
struct stat_item_data {
- char *prefix, *postfix;
+ const char *prefix, *postfix;
unsigned x, y, len;
int fg, bg, align;
};
/* gui_theme */
struct gui_theme {
- char *name;
- char *author;
+ const char *name;
+ const char *author;
int sb_fg, sb_bg;
int cmd_fg, cmd_bg;
int output_fg, output_bg;
int err_msg_fg, err_msg_bg;
int welcome_fg, welcome_bg;
int sep_fg, sep_bg;
- char *sep_str;
+ const char *sep_str;
int default_fg, default_bg;
int top_lines_default, top_lines_min;
#define CENTER 3
-__printf_2_3 void para_log(int, char*, ...);
+__printf_2_3 void para_log(int, const char*, ...);
/* taken from printf man page */
#define PARA_VSPRINTF(fmt, p) \
p = para_realloc(p, size); \
} \
}
-
-
-