emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-reconfigure: avoid xbps-install/state_cb.c dependency.

Browse Source
This commit is contained in:
Juan RP 2012-11-03 09:43:28 +01:00
parent 0fbe845e32
commit d61e12d75e
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/xbps-reconfigure/Makefile
View File

@ -2,7 +2,7 @@ TOPDIR = ../..
-include $(TOPDIR)/config.mk -include $(TOPDIR)/config.mk
BIN = xbps-reconfigure BIN = xbps-reconfigure
OBJS = main.o ../xbps-install/state_cb.o OBJS = main.o
#MAN = $(BIN).8 #MAN = $(BIN).8
include $(TOPDIR)/mk/prog.mk include $(TOPDIR)/mk/prog.mk

33
bin/xbps-reconfigure/main.c
View File

@ -29,9 +29,9 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h> #include <getopt.h>
#include <syslog.h>
#include <xbps_api.h> #include <xbps_api.h>
#include "../xbps-bin/defs.h"
static void __attribute__((noreturn)) static void __attribute__((noreturn))
usage(bool fail) usage(bool fail)
@ -50,6 +50,37 @@ usage(bool fail)
exit(fail ? EXIT_FAILURE : EXIT_SUCCESS); exit(fail ? EXIT_FAILURE : EXIT_SUCCESS);
} }
static void
state_cb(struct xbps_handle *xhp, struct xbps_state_cb_data *xscd, void *cbd)
{
bool syslog_enabled = false;
(void)cbd;
if (xhp->flags & XBPS_FLAG_SYSLOG) {
syslog_enabled = true;
openlog("xbps-reconfigure", LOG_CONS, LOG_USER);
}
switch (xscd->state) {
/* notifications */
case XBPS_STATE_CONFIGURE:
printf("Configuring `%s-%s' ...\n", xscd->pkgname,
xscd->version);
break;
/* errors */
case XBPS_STATE_CONFIGURE_FAIL:
xbps_error_printf("%s\n", xscd->desc);
if (syslog_enabled)
syslog(LOG_ERR, "%s", xscd->desc);
break;
default:
xbps_dbg_printf(xhp,
"unknown state %d\n", xscd->state);
break;
}
}
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {