View | Details | Raw Unified | Return to bug 96992
Collapse All | Expand All

(-)/usr/home/db/tlf/Makefile (-3 / +2 lines)
Lines 2-12 Link Here
2
# Date created:		10 July 2004
2
# Date created:		10 July 2004
3
# Whom:			db
3
# Whom:			db
4
#
4
#
5
# $FreeBSD: ports/comms/tlf/Makefile,v 1.2 2006/01/21 17:37:06 krion Exp $
5
# $FreeBSD: ports/comms/tlf/Makefile,v 1.3 2006/05/03 23:38:38 edwin Exp $
6
#
6
#
7
7
8
PORTNAME=	tlf
8
PORTNAME=	tlf
9
PORTVERSION=	0.9.19
9
PORTVERSION=	0.9.30
10
CATEGORIES=	comms hamradio
10
CATEGORIES=	comms hamradio
11
MASTER_SITES=	http://www.wwns.com/tlf/ \
11
MASTER_SITES=	http://www.wwns.com/tlf/ \
12
		http://sharon.esrac.ele.tue.nl/pub/linux/ham/tlf/
12
		http://sharon.esrac.ele.tue.nl/pub/linux/ham/tlf/
Lines 15-21 Link Here
15
MAINTAINER=	db@db.net
15
MAINTAINER=	db@db.net
16
COMMENT=	Amateur Radio curses based logging program
16
COMMENT=	Amateur Radio curses based logging program
17
17
18
USE_REINPLACE=	yes
19
GNU_CONFIGURE=	yes
18
GNU_CONFIGURE=	yes
20
CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
19
CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
21
20
(-)/usr/home/db/tlf/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (tlf/tlf-0.9.19.tar.gz) = a6318f099d6baf910b425f8e32820c56
1
MD5 (tlf/tlf-0.9.30.tar.gz) = fc8faeb23d7a54c96eb3a962cc4d9e4e
2
SHA256 (tlf/tlf-0.9.19.tar.gz) = fc079eb58fb58bc2ea9162b8cef9baef4849fb8abd8ae74d6f3707b475ee0876
2
SHA256 (tlf/tlf-0.9.30.tar.gz) = c81f9fd21268bae1bca7b3eecd09216885e1b1b8428d4b1d50af386c036de4ee
3
SIZE (tlf/tlf-0.9.19.tar.gz) = 348768
3
SIZE (tlf/tlf-0.9.30.tar.gz) = 390608
(-)/usr/home/db/tlf/files/patch-share_logcfg.dat (+13 lines)
Line 0 Link Here
1
--- share/logcfg.dat.orig	Mon May  8 14:51:58 2006
2
+++ share/logcfg.dat	Mon May  8 14:52:09 2006
3
@@ -27,8 +27,8 @@
4
 #                               #
5
 #################################
6
 #
7
-EDITOR=joe
8
-#EDITOR=vi
9
+#EDITOR=joe
10
+EDITOR=vi
11
 #EDITOR=e3
12
 #EDITOR=MC
13
 #
(-)/usr/home/db/tlf/files/patch-src_audio.c (-18 / +208 lines)
Lines 1-18 Link Here
1
--- src/audio.c.orig	Sat Jul 10 21:31:56 2004
1
--- src/audio.c.orig	Wed Apr  5 03:16:50 2006
2
+++ src/audio.c	Sat Jul 10 21:32:05 2004
2
+++ src/audio.c	Mon May  8 14:31:45 2006
3
@@ -578,6 +578,7 @@
3
@@ -30,6 +30,8 @@
4
4
 #include "onechar.h"
5
 float testvalue;
5
 
6
 char key = '\0';
6
 extern char sc_device[];
7
+int runnit = 1;
7
+char soundlog_dir[FILENAME_MAX];
8
8
+char *home;
9
 clear();
9
 
10
10
 int afd;
11
@@ -586,7 +587,6 @@
11
 
12
 /* ------------initialize sound card --------*/
12
@@ -668,10 +670,8 @@
13
 init_audio();
13
 				mvprintw(15,20, "recording %s", ph_message[0]);
14
14
 				mvprintw(16,20, "");
15
-int runnit = 1;
15
 				refresh();
16
16
-				strcpy(commands,"rec -w -r 8000 -d ");
17
 while (runnit == 1) {
17
-				strcat(commands, sc_device);
18
18
- 				strcat(commands, " ");			// (W9WI)
19
- 				strcat(commands, ph_message[0]);
20
+				snprintf(commands,sizeof(commands), "rec -w -w 8000 -d %s %s",
21
+					sc_device, ph_message[0]);
22
 				system (commands);
23
 				runnit = 0;
24
 				break;
25
@@ -680,21 +680,16 @@
26
 				mvprintw(16,20, "");
27
 				refresh();
28
 
29
-				strcpy(commands,"rec -w -r 8000 -d ");
30
-				strcat(commands, sc_device);
31
-				strcat(commands, " ");			// (W9WI)
32
-				strcat(commands, ph_message[1]);
33
-				system (commands);
34
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
35
+					sc_device, ph_message[1]);
36
 				runnit = 0;
37
 				break;
38
 			case 131 :
39
 				mvprintw(15,20, "recording %s", ph_message[2]);
40
 				mvprintw(16,20, "");
41
 				refresh();
42
-				strcpy(commands,"rec -w -r 8000 -d ");
43
-				strcat(commands, sc_device);
44
- 				strcat(commands, " ");			// (W9WI)
45
-				strcat(commands, ph_message[2]);
46
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
47
+					sc_device, ph_message[2]);
48
 				system (commands);
49
 				runnit = 0;
50
 				break;
51
@@ -702,10 +697,8 @@
52
 				mvprintw(15,20, "recording %s", ph_message[3]);
53
 				mvprintw(16,20, "");
54
 				refresh();
55
-				strcpy(commands,"rec -w -r 8000 -d ");
56
-				strcat(commands, sc_device);
57
-				strcat(commands, " ");			// (W9WI)
58
-				strcat(commands, ph_message[3]);
59
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
60
+					sc_device, ph_message[3]);
61
 				system (commands);
62
 				runnit = 0;
63
 				break;
64
@@ -713,10 +706,8 @@
65
 				mvprintw(15,20, "recording %s", ph_message[4]);
66
 				mvprintw(16,20, "");
67
 				refresh();
68
-				strcpy(commands,"rec -w -r 8000 -d ");
69
-				strcat(commands, sc_device);
70
- 				strcat(commands, " ");				// (W9WI)
71
-				strcat(commands, ph_message[4]);
72
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
73
+					sc_device, ph_message[4]);
74
 				system (commands);
75
 				runnit = 0;
76
 				break;
77
@@ -724,10 +715,8 @@
78
 				mvprintw(15,20, "recording %s", ph_message[5]);
79
 				mvprintw(16,20, "");
80
 				refresh();
81
-				strcpy(commands,"rec -w -r 8000 -d ");
82
-				strcat(commands, sc_device);
83
- 				strcat(commands, " ");				// (W9WI)
84
-				strcat(commands, ph_message[5]);
85
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
86
+					sc_device, ph_message[5]);
87
 				system (commands);
88
 				runnit = 0;
89
 				break;
90
@@ -735,10 +724,8 @@
91
 				mvprintw(15,20, "recording %s", ph_message[6]);
92
 				mvprintw(16,20, "");
93
 				refresh();
94
-				strcpy(commands,"rec -w -r 8000 -d ");
95
-				strcat(commands, sc_device);
96
- 				strcat(commands, " ");				// (W9WI)
97
-				strcat(commands, ph_message[6]);
98
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
99
+					sc_device, ph_message[6]);
100
 				system (commands);
101
 				runnit = 0;
102
 				break;
103
@@ -746,10 +733,8 @@
104
 				mvprintw(15,20, "recording %s", ph_message[7]);
105
 				mvprintw(16,20, "");
106
 				refresh();
107
-				strcpy(commands,"rec -w -r 8000 -d ");
108
-				strcat(commands, sc_device);
109
- 				strcat(commands, " ");				// (W9WI)
110
-				strcat(commands, ph_message[7]);
111
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
112
+					sc_device, ph_message[7]);
113
 				system (commands);
114
 				runnit = 0;
115
 				break;
116
@@ -757,10 +742,8 @@
117
 				mvprintw(15,20, "recording %s", ph_message[8]);
118
 				mvprintw(16,20, "");
119
 				refresh();
120
-				strcpy(commands,"rec -w -r 8000 -d ");
121
-				strcat(commands, sc_device);
122
- 				strcat(commands, " ");				// (W9WI)
123
-				strcat(commands, ph_message[8]);
124
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
125
+					sc_device, ph_message[8]);
126
 				system (commands);
127
 				runnit = 0;
128
 				break;
129
@@ -768,10 +751,8 @@
130
 				mvprintw(15,20, "recording %s", ph_message[9]);
131
 				mvprintw(16,20, "");
132
 				refresh();
133
-				strcpy(commands,"rec -w -r 8000 -d ");
134
-				strcat(commands, sc_device);
135
- 				strcat(commands, " ");				// (W9WI)
136
-				strcat(commands, ph_message[9]);
137
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
138
+					sc_device, ph_message[9]);
139
 				system (commands);
140
 				runnit = 0;
141
 				break;
142
@@ -779,10 +760,8 @@
143
 				mvprintw(15,20, "recording %s", ph_message[10]);
144
 				mvprintw(16,20, "");
145
 				refresh();
146
-				strcpy(commands,"rec -w -r 8000 -d ");
147
-				strcat(commands, sc_device);
148
- 				strcat(commands, " ");				// (W9WI)
149
-				strcat(commands, ph_message[10]);
150
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
151
+					sc_device, ph_message[10]);
152
 				system (commands);
153
 				runnit = 0;
154
 				break;
155
@@ -790,10 +769,8 @@
156
 				mvprintw(15,20, "recording %s", ph_message[11]);
157
 				mvprintw(16,20, "");
158
 				refresh();
159
-				strcpy(commands,"rec -w -r 8000 -d ");
160
-				strcat(commands, sc_device);
161
- 				strcat(commands, " ");				// (W9WI)
162
-				strcat(commands, ph_message[11]);
163
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
164
+					sc_device, ph_message[11]);
165
 				system (commands);
166
 				runnit = 0;
167
 				break;
168
@@ -802,10 +779,8 @@
169
 				mvprintw(15,20, "recording %s", ph_message[12]);
170
 				mvprintw(16,20, "");
171
 				refresh();
172
-				strcpy(commands,"rec -w -r 8000 -d ");
173
-				strcat(commands, sc_device);
174
- 				strcat(commands, " ");				// (W9WI)
175
-				strcat(commands, ph_message[12]);
176
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
177
+					sc_device, ph_message[12]);
178
 				system (commands);
179
 				runnit = 0;
180
 				break;
181
@@ -814,10 +789,8 @@
182
 				mvprintw(15,20, "recording %s", ph_message[13]);
183
 				mvprintw(16,20, "");
184
 				refresh();
185
-				strcpy(commands,"rec -w -r 8000 -d ");
186
-				strcat(commands, sc_device);
187
- 				strcat(commands, " ");				// (W9WI)
188
-				strcat(commands, ph_message[13]);
189
+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
190
+					sc_device, ph_message[13]);
191
 				system (commands);
192
 				runnit = 0;
193
 				break;
194
@@ -840,7 +813,13 @@
195
 				runnit = 0;
196
 				break;
197
 			case '3' :
198
- 				sounddir = opendir("$HOME/tlf/soundlogs/");		// (W9WI)
199
+				if ((home = getenv("HOME")) != NULL) {
200
+				 	snprintf(soundlog_dir,sizeof(soundlog_dir),
201
+						"%s/tlf/soundlogs/", home);
202
+	 				sounddir = opendir(soundlog_dir);
203
+				} else
204
+					sounddir = NULL;
205
+
206
 
207
 				if (sounddir == NULL) break;
208
 
(-)/usr/home/db/tlf/files/patch-src_callinput.c (-18 lines)
Lines 1-18 Link Here
1
--- src/callinput.c.orig	Sat Jul 10 21:33:41 2004
2
+++ src/callinput.c	Sat Jul 10 21:34:33 2004
3
@@ -26,6 +26,7 @@
4
 #include "addspot.h"
5
 #include "changefreq.h"
6
7
+void send_bandswitch(int freq);
8
9
10
 int callinput(void)
11
@@ -105,7 +106,6 @@
12
13
 instring[1] = '\0';
14
15
-void send_bandswitch(int freq);
16
17
 if (use_rxvt == 0) attron(COLOR_PAIR(NORMCOLOR) | A_BOLD );
18
 else     attron(COLOR_PAIR(NORMCOLOR) );
(-)/usr/home/db/tlf/files/patch-src_cluster_bg.c (-52 lines)
Lines 1-52 Link Here
1
--- src/cluster_bg.c.orig	Mon Aug 23 15:00:34 2004
2
+++ src/cluster_bg.c	Mon Aug 23 15:02:36 2004
3
@@ -7,12 +7,11 @@
4
5
6
7
-int cluster_bg(int cluster) {
8
+int cluster_bg(int cluster_arg) {
9
10
 extern char spot_ptr[MAX_SPOTS][82];
11
 extern int spotarray[MAX_SPOTS];
12
 extern char spotinfo[32][82];
13
-extern int cluster;
14
 extern int announcefilter;
15
 extern int bandinx;
16
17
@@ -22,14 +21,14 @@
18
19
20
21
-				if (cluster == NOCLUSTER)
22
+				if (cluster_arg == NOCLUSTER)
23
 					return(1);
24
25
-				if (cluster == MAP)
26
+				if (cluster_arg == MAP)
27
 					clustermode = bandinx;
28
-				if (cluster  == SPOTS)
29
+				if (cluster_arg  == SPOTS)
30
 					clustermode =  9;
31
-				if ( cluster  != CLUSTER)
32
+				if ( cluster_arg  != CLUSTER)
33
34
 				{
35
 				announcefilter = FILTER_DX;
36
@@ -77,7 +76,7 @@
37
 				}
38
39
40
-				if (cluster  == CLUSTER){             /* all cluster info  */
41
+				if (cluster_arg  == CLUSTER){             /* all cluster info  */
42
43
 		   			k = getclusterinfo();
44
45
@@ -100,7 +99,6 @@
46
 extern int spotarray[];
47
 extern int announcefilter;
48
 extern char call[];
49
-extern int cluster;
50
 extern int bandinx;
51
52
 int bg, nd, i;
(-)/usr/home/db/tlf/files/patch-src_parse_logcfg.c (-19 lines)
Lines 1-19 Link Here
1
*** src/parse_logcfg.c.orig	Fri Nov 12 15:37:30 2004
2
--- src/parse_logcfg.c	Fri Nov 12 15:38:53 2004
3
***************
4
*** 170,176 ****
5
  	extern char bc_hostaddress[MAXNODES][16];
6
  	extern int lan_active;
7
  	extern char thisnode;
8
! 	extern char nodes;
9
  	extern int node;
10
  	extern int cqwwm2;
11
  	extern int landebug;
12
--- 170,176 ----
13
  	extern char bc_hostaddress[MAXNODES][16];
14
  	extern int lan_active;
15
  	extern char thisnode;
16
! 	extern int nodes;
17
  	extern int node;
18
  	extern int cqwwm2;
19
  	extern int landebug;
(-)/usr/home/db/tlf/files/patch-src_rtty.c (-29 lines)
Lines 1-29 Link Here
1
--- src/rtty.c.orig	Sat Jul 10 21:41:49 2004
2
+++ src/rtty.c	Sun Jul 11 00:52:01 2004
3
@@ -72,7 +72,7 @@
4
5
 int ry_addtext(char *line) {
6
7
-extern char ry_term[][];
8
+//extern char ry_term[][];
9
10
 int k, m, j;
11
 char *ptr;
12
@@ -137,7 +137,7 @@
13
 int show_rtty(void) {
14
15
 extern int use_rxvt;
16
-extern char ry_term[][];
17
+//extern char ry_term[][];
18
 extern int trxmode;
19
20
 if (trxmode != DIGIMODE)
21
@@ -169,7 +169,7 @@
22
23
 extern char hiscall[];
24
 extern int miniterm;
25
-extern char ry_term[][];
26
+//extern char ry_term[][];
27
28
 int i = 0;
29
 char line[40];
(-)/usr/home/db/tlf/files/patch-src_searchcallarray.c (-12 lines)
Lines 1-12 Link Here
1
*** src/searchcallarray.c.orig	Fri Nov 12 15:40:59 2004
2
--- src/searchcallarray.c	Fri Nov 12 15:41:45 2004
3
***************
4
*** 25,31 ****
5
6
   	int searchcallarray  (char  *hiscall)
7
   	{
8
-  	extern char hiscall[];
9
   	extern int callarray_nr;
10
   	extern char callarray[MAX_CALLS][20];
11
12
--- 25,30 ----
(-)/usr/home/db/tlf/files/patch-src_searchlog.c (-37 lines)
Lines 1-37 Link Here
1
--- src/searchlog.c.orig	Fri May 21 12:15:14 2004
2
+++ src/searchlog.c	Sun Jul 11 01:04:54 2004
3
@@ -26,6 +26,8 @@
4
 #	include <config.h>
5
 #endif
6
7
+static char searchresult[MAX_CALLS][82];
8
+static char result[MAX_CALLS][82];
9
10
  	int searchlog(char *searchstring)
11
12
@@ -75,9 +77,7 @@
13
     extern int itumult;
14
15
16
-char searchresult[MAX_CALLS][82];
17
 int srch_index=0;
18
-char result[MAX_CALLS][82];
19
 int r_index=0;
20
 char s_inputbuffer[82] =  "";
21
 char s_inputbuffercpy[82] =  "";
22
@@ -90,13 +90,13 @@
23
 char *tmpstr;
24
25
 char callmaster_location[80];
26
-
27
+#if 0
28
 	if (strlen(s_inputbuffer)>=83)
29
 	{
30
 		printf ("WARNING: Input buffer is longer than 82 characters! exiting...");
31
 		exit(1);
32
 	}
33
-
34
+#endif
35
 	strcpy(callmaster_location, PACKAGE_DATA_DIR) ;
36
 	strcat(callmaster_location, "/callmaster ") ;
37
(-)/usr/home/db/tlf/files/patch-src_splitscreen.c (-36 lines)
Lines 1-36 Link Here
1
*** src/splitscreen.c.orig	Fri Nov 12 15:44:12 2004
2
--- src/splitscreen.c	Fri Nov 12 15:52:19 2004
3
***************
4
*** 50,56 ****
5
  extern struct tln_logline *logtail;
6
  extern struct tln_logline *temp;
7
  extern struct tln_logline *viewing;
8
! extern char spot_ptr[100][82];
9
  extern char lastmsg[80];
10
  extern int ptr;
11
12
--- 50,56 ----
13
  extern struct tln_logline *logtail;
14
  extern struct tln_logline *temp;
15
  extern struct tln_logline *viewing;
16
! extern char spot_ptr[MAX_SPOTS][82];
17
  extern char lastmsg[80];
18
  extern int ptr;
19
20
***************
21
*** 722,728 ****
22
  extern SCREEN *packetscreen;
23
  extern WINDOW *sclwin;
24
  extern WINDOW *entwin;
25
! extern char spot_ptr[100][80];
26
  extern int tncport;
27
  extern int fdSertnc;
28
  extern int fdFIFO;
29
--- 722,728 ----
30
  extern SCREEN *packetscreen;
31
  extern WINDOW *sclwin;
32
  extern WINDOW *entwin;
33
! extern char spot_ptr[MAX_SPOTS][82];
34
  extern int tncport;
35
  extern int fdSertnc;
36
  extern int fdFIFO;
(-)/usr/home/db/tlf/files/patch-src_splitscreen.h (-11 lines)
Lines 1-11 Link Here
1
--- src/splitscreen.h.orig	Sat Jul 10 21:29:22 2004
2
+++ src/splitscreen.h	Sat Jul 10 21:29:42 2004
3
@@ -17,7 +17,7 @@
4
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
5
  */
6
  // splitscreen.h
7
-
8
+#include <sys/types.h>
9
 #include <curses.h>
10
 #include "sockserv.h"
11
 #include <errno.h>
(-)/usr/home/db/tlf/files/patch-src_writecabrillo.c (-25 lines)
Lines 1-25 Link Here
1
--- src/writecabrillo.c.orig	Sat Jul 10 22:23:15 2004
2
+++ src/writecabrillo.c	Sat Jul 10 22:24:47 2004
3
@@ -45,6 +45,7 @@
4
 	char buf[181];
5
 	char buffer[82]= "";
6
     char standardexchange[70] = "";
7
+    char ssa_mt_exchange[30];
8
9
 	FILE *fp1,  *fp2;
10
11
@@ -271,13 +272,12 @@
12
 					strcat(buffer, "599 ");
13
14
 				if (strcmp (whichcontest, "ssa_mt") == 0) {
15
+					int i=0, j=0, k = 0;
16
 //					strncat(buffer, buf+54, 9);  // tbf for all contests? RC
17
 					strcat(buffer, "                      ");
18
19
 					sprintf(buffer + 79, "%03d    ", atoi(buf+54));
20
21
-					char ssa_mt_exchange[30];
22
-					int i=0, j=0, k = 0;
23
24
 					for (i=0; i < 12; i++) {
25
 						if (isalpha(buf[54+i])){

Return to bug 96992