diff options
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | src/Makefile | 7 | ||||
| -rw-r--r-- | src/ivy.c | 10 | ||||
| -rw-r--r-- | src/ivyprobe.c | 10 |
5 files changed, 27 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index f8f9f64..3e5722a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +ivy-c (3.0-1) unstable; urgency=low + + * new api : see documentation + * src/Makefile : updates + * src/ivy.c + * - bug correction when broadcast socket can't be opened + * src/ivychannel.c : + * - bug correction when handling expceptions on channels + * Clean headers + * testivy -> ivyprobe + + -- Hervé Damiano <damiano@cenatoulouse.dgac.fr> Thu, 18 Feb 1999 11:50:50 +0100 + ivy-c (1.2-1) unstable; urgency=low * Mise au propre diff --git a/debian/rules b/debian/rules index 1713808..39d777a 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,6 @@ build: clean: $(checkdir) -rm -f build - -rm -rf debian/tmp `find debian/* -type d ! -name CVS` debian/files* core -rm -f debian/*substvars @@ -30,7 +29,7 @@ binary-indep: checkroot build binary-arch: checkroot build $(checkdir) - -rm -rf debian/tmp `find debian/* -type d` + -rm -rf debian/tmp `find debian/* -type d ! -name CVS` install -d debian/tmp cd debian/tmp && install -d `cat ../dirs` diff --git a/src/Makefile b/src/Makefile index 715c9af..51bb206 100644 --- a/src/Makefile +++ b/src/Makefile @@ -25,13 +25,6 @@ GOBJ = ivyloop.o timer.o ivysocket.o givy.o XTOBJ = ivyxtloop.o ivysocket.o ivy.o TARGETS = ivyprobe ivyxtprobe -ifneq (strip $(MAJOR),) -MAJOR=1 -endif -ifneq (strip $(MINOR),) -MINOR=3 -endif - .c.o: $(CC) -fPIC $(CFLAGS) -c $*.c @@ -39,8 +39,14 @@ #define ARG_START "\002" #define ARG_END "\003" - -static char* DefaultIvyBus = "127.255.255.255"; +#define DEFAULT_DOMAIN 127.255.255.255 + +/* stringification et concatenation du domaine et du port en 2 temps : + * Obligatoire puisque la substitution de domain, et de bus n'est pas + * effectuée si on stringifie directement dans la macro GenerateIvyBus */ +#define str(bus) #bus +#define GenerateIvyBus(domain,bus) str(domain)##":"str(bus) +static char* DefaultIvyBus = GenerateIvyBus(DEFAULT_DOMAIN,DEFAULT_BUS); typedef enum { diff --git a/src/ivyprobe.c b/src/ivyprobe.c index f3d1bee..970d5b2 100644 --- a/src/ivyprobe.c +++ b/src/ivyprobe.c @@ -193,17 +193,17 @@ int main(int argc, char *argv[]) int c; int timer_test = 0; char dbuf [1024] = ""; - const char* domains = 0; + const char* bus = 0; while ((c = getopt(argc, argv, "d:b:w:t")) != EOF) switch (c) { case 'b': bport = atoi(optarg) ; break; case 'd': - if (domains) + if (bus) strcat (dbuf, ","); else - domains = dbuf; + bus = dbuf; strcat (dbuf, optarg); break; case 'w': @@ -220,7 +220,7 @@ int main(int argc, char *argv[]) cntx = XtCreateApplicationContext(); IvyXtChannelAppContext (cntx); #endif - IvyInit ("IVYPROBE", bport, "IVYPROBE READY", ApplicationCallback,NULL,NULL,NULL); + IvyInit ("IVYPROBE", "IVYPROBE READY", ApplicationCallback,NULL,NULL,NULL); for (; optind < argc; optind++) IvyBindMsg (Callback, NULL, argv[optind]); @@ -231,7 +231,7 @@ int main(int argc, char *argv[]) IvyChannelSetUp (0, NULL, NULL, HandleStdin); #endif - IvyStart (domains); + IvyStart (bus); if (timer_test) { #ifndef XTMAINLOOP |