Index: say.c
===================================================================
RCS file: /usr/cvsroot/asterisk/say.c,v
retrieving revision 1.16
diff -u -r1.16 say.c
--- say.c	20 Feb 2004 17:43:46 -0000	1.16
+++ say.c	20 Apr 2004 19:27:40 -0000
@@ -36,13 +36,13 @@
 	while(fn2[num] && !res) {
 		switch (fn2[num]) {
 			case ('*'):
-				snprintf(fn, sizeof(fn), "digits/star");
+				snprintf(fn, sizeof(fn), DIGITS_DIR "star");
 				break;
 			case ('#'):
-				snprintf(fn, sizeof(fn), "digits/pound");
+				snprintf(fn, sizeof(fn), DIGITS_DIR "pound");
 				break;
 			default:
-				snprintf(fn, sizeof(fn), "digits/%c", fn2[num]);
+				snprintf(fn, sizeof(fn), DIGITS_DIR "%c", fn2[num]);
 			}
 		res = ast_streamfile(chan, fn, lang);
 		if (!res) 
@@ -59,7 +59,7 @@
 	int num = 0;
 	int res = 0;
 	while(fn2[num] && !res) {
-		snprintf(fn, sizeof(fn), "digits/%c", fn2[num]);
+		snprintf(fn, sizeof(fn), DIGITS_DIR "%c", fn2[num]);
 		res = ast_streamfile(chan, fn, lang);
 		if (!res) 
 			res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
@@ -101,19 +101,19 @@
 			language = "en";
 		while(!res && (num || playh)) {
 			if (playh) {
-				snprintf(fn, sizeof(fn), "digits/hundred");
+				snprintf(fn, sizeof(fn), DIGITS_DIR "hundred");
 				playh = 0;
 			} else
 			if (num < 20) {
-				snprintf(fn, sizeof(fn), "digits/%d", num);
+				snprintf(fn, sizeof(fn), DIGITS_DIR "%d", num);
 				num = 0;
 			} else
 			if (num < 100) {
-				snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
+				snprintf(fn, sizeof(fn), DIGITS_DIR "%d", (num /10) * 10);
 				num -= ((num / 10) * 10);
 			} else {
 				if (num < 1000){
-					snprintf(fn, sizeof(fn), "digits/%d", (num/100));
+					snprintf(fn, sizeof(fn), DIGITS_DIR "%d", (num/100));
 					playh++;
 					num -= ((num / 100) * 100);
 				} else {
@@ -122,14 +122,14 @@
 						if (res)
 							return res;
 						num = num % 1000;
-						snprintf(fn, sizeof(fn), "digits/thousand");
+						snprintf(fn, sizeof(fn), DIGITS_DIR "thousand");
 					} else {
 						if (num < 1000000000) {	/* 1,000,000,000 */
 							res = ast_say_number_full(chan, num / 1000000, ints, language, audiofd, ctrlfd);
 							if (res)
 								return res;
 							num = num % 1000000;
-							snprintf(fn, sizeof(fn), "digits/million");
+							snprintf(fn, sizeof(fn), DIGITS_DIR "million");
 						} else {
 							ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
 							res = -1;
@@ -164,19 +164,19 @@
 		language = "en";
 		while(!res && (num || playh)) {
 			if (playh) {
-				snprintf(fn, sizeof(fn), "digits/hundred");
+				snprintf(fn, sizeof(fn), DIGITS_DIR "hundred");
 				playh = 0;
 			} else
 			if (num < 20) {
-				snprintf(fn, sizeof(fn), "digits/%d", num);
+				snprintf(fn, sizeof(fn), DIGITS_DIR "%d", num);
 				num = 0;
 			} else
 			if (num < 100) {
-				snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
+				snprintf(fn, sizeof(fn), DIGITS_DIR "%d", (num /10) * 10);
 				num -= ((num / 10) * 10);
 			} else {
 				if (num < 1000){
-					snprintf(fn, sizeof(fn), "digits/%d", (num/100));
+					snprintf(fn, sizeof(fn), DIGITS_DIR "%d", (num/100));
 					playh++;
 					num -= ((num / 100) * 100);
 				} else {
@@ -185,14 +185,14 @@
 						if (res)
 							return res;
 						num = num % 1000;
-						snprintf(fn, sizeof(fn), "digits/thousand");
+						snprintf(fn, sizeof(fn), DIGITS_DIR "thousand");
 					} else {
 						if (num < 1000000000) {
 							res = ast_say_number(chan, num / 1000000, ints, language);
 							if (res)
 								return res;
 							num = num % 1000000;
-							snprintf(fn, sizeof(fn), "digits/million");
+							snprintf(fn, sizeof(fn), DIGITS_DIR "million");
 						} else {
 							ast_log(LOG_DEBUG, "Number '%d' is too big for me\n", num);
 							res = -1;
@@ -218,13 +218,13 @@
 	int res = 0;
 	ast_localtime(&t,&tm,NULL);
 	if (!res) {
-		snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
+		snprintf(fn, sizeof(fn), DIGITS_DIR "day-%d", tm.tm_wday);
 		res = ast_streamfile(chan, fn, lang);
 		if (!res)
 			res = ast_waitstream(chan, ints);
 	}
 	if (!res) {
-		snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
+		snprintf(fn, sizeof(fn), DIGITS_DIR "mon-%d", tm.tm_mon);
 		res = ast_streamfile(chan, fn, lang);
 		if (!res)
 			res = ast_waitstream(chan, ints);
@@ -552,23 +552,23 @@
 			res = ast_say_number(chan, tm.tm_min, ints, lang);
 	} else if (tm.tm_min) {
 		if (!res)
-			res = ast_streamfile(chan, "digits/oh", lang);
+			res = ast_streamfile(chan, DIGITS_DIR "oh", lang);
 		if (!res)
 			res = ast_waitstream(chan, ints);
 		if (!res)
 			res = ast_say_number(chan, tm.tm_min, ints, lang);
 	} else {
 		if (!res)
-			res = ast_streamfile(chan, "digits/oclock", lang);
+			res = ast_streamfile(chan, DIGITS_DIR "oclock", lang);
 		if (!res)
 			res = ast_waitstream(chan, ints);
 	}
 	if (pm) {
 		if (!res)
-			res = ast_streamfile(chan, "digits/p-m", lang);
+			res = ast_streamfile(chan, DIGITS_DIR "p-m", lang);
 	} else {
 		if (!res)
-			res = ast_streamfile(chan, "digits/a-m", lang);
+			res = ast_streamfile(chan, DIGITS_DIR "a-m", lang);
 	}
 	if (!res)
 		res = ast_waitstream(chan, ints);
@@ -583,13 +583,13 @@
 	int hour, pm=0;
 	localtime_r(&t,&tm);
 	if (!res) {
-		snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
+		snprintf(fn, sizeof(fn), DIGITS_DIR "day-%d", tm.tm_wday);
 		res = ast_streamfile(chan, fn, lang);
 		if (!res)
 			res = ast_waitstream(chan, ints);
 	}
 	if (!res) {
-		snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
+		snprintf(fn, sizeof(fn), DIGITS_DIR "mon-%d", tm.tm_mon);
 		res = ast_streamfile(chan, fn, lang);
 		if (!res)
 			res = ast_waitstream(chan, ints);
@@ -614,23 +614,23 @@
 			res = ast_say_number(chan, tm.tm_min, ints, lang);
 	} else if (tm.tm_min) {
 		if (!res)
-			res = ast_streamfile(chan, "digits/oh", lang);
+			res = ast_streamfile(chan, DIGITS_DIR "oh", lang);
 		if (!res)
 			res = ast_waitstream(chan, ints);
 		if (!res)
 			res = ast_say_number(chan, tm.tm_min, ints, lang);
 	} else {
 		if (!res)
-			res = ast_streamfile(chan, "digits/oclock", lang);
+			res = ast_streamfile(chan, DIGITS_DIR "oclock", lang);
 		if (!res)
 			res = ast_waitstream(chan, ints);
 	}
 	if (pm) {
 		if (!res)
-			res = ast_streamfile(chan, "digits/p-m", lang);
+			res = ast_streamfile(chan, DIGITS_DIR "p-m", lang);
 	} else {
 		if (!res)
-			res = ast_streamfile(chan, "digits/a-m", lang);
+			res = ast_streamfile(chan, DIGITS_DIR "a-m", lang);
 	}
 	if (!res)
 		res = ast_waitstream(chan, ints);
@@ -656,7 +656,7 @@
 	if ((daydiff < 0) || (daydiff > 6)) {
 		/* Day of month and month */
 		if (!res) {
-			snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
+			snprintf(fn, sizeof(fn), DIGITS_DIR "mon-%d", tm.tm_mon);
 			res = ast_streamfile(chan, fn, lang);
 			if (!res)
 				res = ast_waitstream(chan, ints);
@@ -667,7 +667,7 @@
 	} else if (daydiff) {
 		/* Just what day of the week */
 		if (!res) {
-			snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
+			snprintf(fn, sizeof(fn), DIGITS_DIR "day-%d", tm.tm_wday);
 			res = ast_streamfile(chan, fn, lang);
 			if (!res)
 				res = ast_waitstream(chan, ints);