Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › cbe6533
Move event_callback to a separate file. It will probably become large.
Will Andrews committed 14 years ago
commit cbe6533a8c31d0ea779f1ac832e9658c3f88cb0d
parent 4c15e76
4 files changed +35 -24
modified pkg/Makefile
@@ -3,6 +3,7 @@ SRCS= add.c \
		autoremove.c \

		create.c \

		delete.c \
+ 
		event.c \

		info.c \

		main.c \

		register.c \
added pkg/event.c
@@ -0,0 +1,27 @@
+ 
#include <archive.h>
+
+ 
#include "pkg.h"
+ 
#include "event.h"
+
+ 
/* XXX: use varargs? */
+ 
int
+ 
event_callback(pkg_event_t ev, void *arg0, void *arg1)
+ 
{
+ 
	struct pkg *pkg;
+ 
	const char *str0, *str1;
+
+ 
	switch(ev) {
+ 
	case PKG_EVENT_INSTALL_BEGIN:
+ 
		pkg = (struct pkg *)arg0;
+ 
		printf("Installing %s\n", pkg_get(pkg, PKG_NAME));
+ 
		break;
+ 
	case PKG_EVENT_ARCHIVE_ERROR:
+ 
		str0 = (const char *)arg0; /* file path */
+ 
		str1 = archive_error_string(arg1);
+ 
		fprintf(stderr, "archive error on %s: %s\n", str0, str1);
+ 
		break;
+ 
	default:
+ 
		break;
+ 
	}
+ 
	return 0;
+ 
}
added pkg/event.h
@@ -0,0 +1,6 @@
+ 
#ifndef __PKG_EVENT_H__
+ 
#define	__PKG_EVENT_H__
+
+ 
int event_callback(pkg_event_t ev, void *arg0, void *arg1);
+
+ 
#endif
modified pkg/main.c
@@ -1,5 +1,4 @@
#include <assert.h>
- 
#include <archive.h>

#include <err.h>

#include <stdio.h>

#include <stdlib.h>
@@ -9,6 +8,7 @@
#include "pkg.h"

#include "create.h"

#include "delete.h"
+ 
#include "event.h"

#include "info.h"

#include "which.h"

#include "add.h"
@@ -99,29 +99,6 @@ exec_help(int argc, char **argv)
	return (EX_USAGE);

}
- 
/* XXX: use varargs? */
- 
static int
- 
event_callback(pkg_event_t ev, void *arg0, void *arg1)
- 
{
- 
	struct pkg *pkg;
- 
	const char *str0, *str1;
-
- 
	switch(ev) {
- 
	case PKG_EVENT_INSTALL_BEGIN:
- 
		pkg = (struct pkg *)arg0;
- 
		printf("Installing %s\n", pkg_get(pkg, PKG_NAME));
- 
		break;
- 
	case PKG_EVENT_ARCHIVE_ERROR:
- 
		str0 = (const char *)arg0; /* file path */
- 
		str1 = archive_error_string(arg1);
- 
		fprintf(stderr, "archive error on %s: %s\n", str0, str1);
- 
		break;
- 
	default:
- 
		break;
- 
	}
- 
	return 0;
- 
}
- 


int

main(int argc, char **argv)

{