File: tart.patch

package info (click to toggle)
tart 3.07-4
  • links: PTS
  • area: main
  • in suites: lenny
  • size: 852 kB
  • ctags: 119
  • sloc: sh: 2,466; ansic: 1,264; makefile: 148
file content (362 lines) | stat: -rw-r--r-- 14,029 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
diff -ur /home/colin/LinuxTaRT-3.07/doc/Makefile.in ./doc/Makefile.in
--- /home/colin/LinuxTaRT-3.07/doc/Makefile.in	2005-05-13 02:32:23.000000000 +0100
+++ ./doc/Makefile.in	2005-09-03 17:36:07.412322580 +0100
@@ -6,8 +6,8 @@
 man1 = 1
 man5 = 5
 
-man1files = TaRT
-man5files = TaRTrc specialdates custom
+man1files = tart
+man5files = tartrc tart-dates tart-custom
 
 all:
 	for manfile in $(man1files); do\
@@ -19,12 +19,12 @@
 
 install: all
 	for manfile in $(man1files); do\
-		($(INSTALL) -m 0644 -d $(MAN1DIR)) || exit 1;\
-		($(INSTALL) -m 0644 $$manfile.$(man1).gz $(MAN1DIR)) || exit 1;\
+		($(INSTALL) -m 0755 -d $(MAN1DIR)) || exit 1;\
+		($(INSTALL) -m 0744 $$manfile.$(man1).gz $(MAN1DIR)) || exit 1;\
 	done
 	for manfile in $(man5files); do\
-		($(INSTALL) -m 0644 -d $(MAN5DIR)) || exit 1;\
-		($(INSTALL) -m 0644 $$manfile.$(man5).gz $(MAN5DIR)) || exit 1;\
+		($(INSTALL) -m 0755 -d $(MAN5DIR)) || exit 1;\
+		($(INSTALL) -m 0744 $$manfile.$(man5).gz $(MAN5DIR)) || exit 1;\
 	done
 
 uninstall:
diff -ur /home/colin/LinuxTaRT-3.07/misc/Makefile.in ./misc/Makefile.in
--- /home/colin/LinuxTaRT-3.07/misc/Makefile.in	2005-05-08 11:59:00.000000000 +0100
+++ ./misc/Makefile.in	2005-09-04 19:17:42.906479106 +0100
@@ -5,10 +5,10 @@
 all:
 
 install:
-	$(INSTALL) -m 0644 -D tag.trt $(datadir)/tag.trt
+	$(INSTALL) -m 0644 -D tart.tags $(datadir)/tart.tags
 
 uninstall:
-	rm -f $(datadir)/tag.trt
+	rm -f $(datadir)/tart.tags
 
 clean:
 
diff -ur /home/colin/LinuxTaRT-3.07/README ./README
--- /home/colin/LinuxTaRT-3.07/README	2005-02-18 13:33:03.000000000 +0000
+++ ./README	2005-09-03 17:43:23.393523028 +0100
@@ -27,31 +27,31 @@
 Notes:
 
 LinuxTaRT has undergone many significant changes since v1.00 - it now no
-longer assumes that the file .TaRTrc is located in the same directory as TaRT
-itself. It now looks for .TaRTrc in the directory pointed to by the $HOME
+longer assumes that the file .tartrc is located in the same directory as TaRT
+itself. It now looks for .tartrc in the directory pointed to by the $HOME
 environment variable (i.e. the current user's home directory).
 LinuxTaRT 2.00 also provides the ability to use completely customizable
 signature layout via a definition file (explained below...)
 LinuxTaRT 2.20 provides special date functionality (explained below...)
 
-Another note for users of 1.05 or earlier, is that your current .TaRTrc file
+Another note for users of 1.05 or earlier, is that your current .tartrc file
 will no longer work as it is, To fix this, simply add the text CustomText1=
 CustomText2=, SignatureFile=, and TagLineDatabase= to the beginning of the
 respective lines in the file (alternatively, you can run the new interactive
-setup util, TaRT -s).
+setup util, tart -s).
 
-I changed the .TaRTrc file to this structure because I wanted to implement a
+I changed the .tartrc file to this structure because I wanted to implement a
 more reliable way of dealing with the settings. These modifications also allow
 the entries to occur in any order, and make it easier to implement a built-in
 setup util (again, see below).
 
-The .TaRTrc file allows the use of comments by inserting a pound or
+The .tartrc file allows the use of comments by inserting a pound or
 "hash" sign # in front of any text that you want to be a comment.
 
 LinuxTaRT has fairly self-explanitory help accessable by using the --help or -h
 command-line arguments.
 
-Since TaRT checks for .TaRTrc in the users home directory, TaRT can be
+Since TaRT checks for .tartrc in the users home directory, TaRT can be
 placed in a user accessible folder like /usr/bin or /usr/local/bin.       
 Then an entry can be added to your .login file or crontab to frequently create
 a new signature.
@@ -113,7 +113,7 @@
 
 Run the setup utility and tell TaRT that this file exists.
 
-If you want special dates turned off temporarily, running TaRT with -sd  will
+If you want special dates turned off temporarily, running tart with -sd  will
 make TaRT ignore special dates.
 
 If your custom signature contains two taglines, and a special date is
@@ -130,7 +130,7 @@
 
 To start TaRT in daemon mode, simply execute TaRT like so:
 
-TaRT --daemon s
+tart --daemon s
 
 where 's' is the desired number of seconds between signature updates.
 
@@ -144,7 +144,7 @@
 TaRT also understands several signals.
 
 If SIGALRM is received, TaRT will update your signature immediately.
-If SIGHUP is received, TaRT will re-read your .TaRTrc file.
+If SIGHUP is received, TaRT will re-read your .tartrc file.
 If SIGTERM or SIGQUIT are received, TaRT will exit normally (this is what -k
 and --kill do)
 
@@ -152,16 +152,16 @@
 immediately.
 
 From version 3.00 onward, preferences such as centering, and special dates can
-be saved in your .TaRTrc file.
+be saved in your .tartrc file.
 
-Run TaRT -s, selecting the defaults for all options, then examine your .TaRTrc
+Run tart -s, selecting the defaults for all options, then examine your .tartrc
 file to see the new settings. All of them are boolean values (0 or 1) except
 for "RunAsDaemon" and "Running".
 
 RunAsDaemon specifies the number of seconds between updates (0 to disable
 daemon mode)
 
-Running is equal to the current TaRT process's PID, or 0 if TaRT is not
+Running is equal to the current tart process's PID, or 0 if tart is not
 running.
 
 If TaRT is abnormally terminated, "Running" will not get set to 0, thereby
diff -ur /home/colin/LinuxTaRT-3.07/README.setup ./README.setup
--- /home/colin/LinuxTaRT-3.07/README.setup	2005-02-18 13:37:37.000000000 +0000
+++ ./README.setup	2005-09-04 19:12:58.280180447 +0100
@@ -2,20 +2,20 @@
 
 After initial installation, TaRT users should run
 
-> TaRT -s
+> tart -s
 
 to create their config files.
 
 By default, the TaRT executable is installed in /usr/local/bin
-and the tagline database (tag.trt) is installed in /etc
+and the tagline database (tart.tags) is installed in /etc
 Although, if you plan on adding a lot of custom taglines to the
-database (TaRT -a) and are not root, you might want to copy tag.trt to
+database (tart -a) and are not root, you might want to copy tart.tags to
 your home directory and use it from there.
 
 TaRT has been shown to run on i386 LinuxELF, RiscOS and SunOS 5.6
 
-An example .TaRTrc file is provided as misc/TaRTrc-distrib
-An axample custom layout file is included as misc/customlayout-distrib
+An example .tartrc file is provided as misc/tartrc-distrib
+An example custom layout file is included as misc/customlayout-distrib
 An example special dates file is included as misc/specialdates-distrib
 
 HINT: 	you may want to add a line to your start-up script or crontab to
diff -ur /home/colin/LinuxTaRT-3.07/src/main.c ./src/main.c
--- /home/colin/LinuxTaRT-3.07/src/main.c	2005-05-13 03:29:06.000000000 +0100
+++ ./src/main.c	2005-09-08 19:24:28.555813270 +0100
@@ -101,7 +101,7 @@
 	if (IsSwitch (argv, argc, "--setup") != -1 || IsSwitch (argv, argc, "-s") != -1)
 		TaRTSetup (custom1, custom2, customfile, sigfile, tagfile, datefile);
 	if (ReadINIFile (custom1, custom2, customfile, sigfile, tagfile, datefile, optarray, NULL) == 1) {
-		fprintf (stderr, "error reading .TaRTrc (First time running TaRT? Try `TaRT --setup')\n");
+		fprintf (stderr, "error reading .tartrc (First time running TaRT? Try `tart --setup')\n");
 		exit (1);
 	}
 	if ((i = IsSwitch (argv, argc, "--config")) != -1)
@@ -111,7 +111,7 @@
 			fprintf(stderr, "invalid filename passed to --config\nexecuting with default config file\n");
 		}
 		if (ReadINIFile (custom1, custom2, customfile, sigfile, tagfile, datefile, optarray, custconfig) == 1) {
-			fprintf (stderr, "error reading .TaRTrc (First time running TaRT? Try `TaRT --setup')\n");
+			fprintf (stderr, "error reading .tartrc (First time running TaRT? Try `tart --setup')\n");
 			exit (1);
 		}
 	}	
@@ -251,7 +251,7 @@
 		
 		if ((i = fork()))
 		{
-			if (SetRunning(i,custconfig) == -1)	// store the PID in ~/.TaRTrc
+			if (SetRunning(i,custconfig) == -1)	// store the PID in ~/.tartrc
 				_exit(1);
 			else
 				_exit(0);
@@ -565,7 +565,7 @@
  * usage: TaRTSetup();
  * ---------------
  * This procedure prompts the user for different settings and
- * creates a new .TaRTrc file in the users home directory.
+ * creates a new .tartrc file in the users home directory.
  * Terminates program execution.
  */
 
@@ -585,10 +585,10 @@
 		strcpy (tagfile, "<Choices$Write>.TaRT.taglines");
 		strcpy (datefile, "Choices:TaRT.SpecialDates");
 #else
-		strcpy (customfile, "~/.custom");
+		strcpy (customfile, "~/.tart-custom");
 		strcpy (sigfile, "~/.signature");
-		strcpy (tagfile, "/etc/tag.trt");
-		strcpy (datefile, "~/.specialdates");
+		strcpy (tagfile, "/etc/tart.tags");
+		strcpy (datefile, "~/.tart-dates");
 #endif
 	}
 	StripCR (custom1);
@@ -638,14 +638,14 @@
 //	strncpy (tmp, "Choices:TaRT.rc", 90);
 //#else
 //	strncpy (tmp, getenv ("HOME"), 90);       /*  find user's homedir */
-//	strcat (tmp, "/.TaRTrc");
+//	strcat (tmp, "/.tartrc");
 //#endif
 //	printf("before fopen line\n");
 //	fclose(fopen(tmp, "w"));
 //	printf("after fopen line\n");			
 	
 	if (FirstINIFile (custom1, custom2, customfile, sigfile, tagfile, datefile, optarray)) {
-		fprintf (stderr, "error creating .TaRTrc\n");
+		fprintf (stderr, "error creating .tartrc\n");
 		exit (1);
 	}
 
diff -ur /home/colin/LinuxTaRT-3.07/src/Makefile.in ./src/Makefile.in
--- /home/colin/LinuxTaRT-3.07/src/Makefile.in	2002-05-17 18:00:22.000000000 +0100
+++ ./src/Makefile.in	2005-08-31 10:51:02.879790850 +0100
@@ -7,19 +7,19 @@
 bindir = @bindir@
 INSTALL = @INSTALL@
 
-all:	tart
+all:	tart-target
 
-tart:	$(OBJS)
-		$(CC) $(CFLAGS) -o TaRT $(OBJS)
+tart-target:	$(OBJS)
+		$(CC) $(CFLAGS) -o tart $(OBJS)
 
 install:
-		install -s -D TaRT $(bindir)/TaRT
+		install -s -D tart $(bindir)/tart
 
 uninstall:
-		rm -f $(bindir)/TaRT
+		rm -f $(bindir)/tart
 
 clean:
-		rm -f *.o TaRT
+		rm -f *.o tart
 
 distclean: clean
 		rm -f Makefile
diff -ur /home/colin/LinuxTaRT-3.07/src/tartutil.c ./src/tartutil.c
--- /home/colin/LinuxTaRT-3.07/src/tartutil.c	2005-05-13 02:32:23.000000000 +0100
+++ ./src/tartutil.c	2005-09-02 20:20:44.054117989 +0100
@@ -162,9 +162,9 @@
 /* function: ReadINIFile
  * usage: i = ReadINIFile(custom1, custom2, customfile, sigfile, tagfile, config);
  * -------------------------
- * This function reads the file .TaRTrc and stores initialization
+ * This function reads the file .tartrc and stores initialization
  * settings in the provided variables.
- * .TaRTrc is assumed to be in the users home directory.
+ * .tartrc is assumed to be in the users home directory.
  * custom1 and custom2 are strings of length TAGLEN (maximum).
  * customfile, sigfile and tagfile are strings of length 256 (maximum).
  * config is a pointer to char malloc'd by sscanf
@@ -180,7 +180,7 @@
         strncpy (PathToINI, "Choices:TaRT.rc", 90);
 #else
 		strncpy (PathToINI, getenv ("HOME"), 90);	/*  find user's homedir */
-		strncat (PathToINI, "/.TaRTrc", 165);
+		strncat (PathToINI, "/.tartrc", 165);
 #endif
 	} else
 	{
@@ -227,7 +227,7 @@
 /* function: Running
  * usage: i = Running(config);
  * ---------------------
- * This function returns TaRT's PID if "Running" is set in the users .TaRTrc
+ * This function returns TaRT's PID if "Running" is set in the users .tartrc
  * file, and 0 otherwise. Use to determine whether TaRT is already running
  * or not.
  * config is a pointer to char malloc'd by sscanf
@@ -243,7 +243,7 @@
         strncpy (PathToINI, "Choices:TaRT.rc", 90);
 #else
 		strncpy (PathToINI, getenv ("HOME"), 90);	/*  find user's homedir */
-		strncat (PathToINI, "/.TaRTrc", 165);
+		strncat (PathToINI, "/.tartrc", 165);
 #endif
 	} else
 	{
@@ -265,7 +265,7 @@
 /* function: SetRunning
  * usage: i = SetRunning(state, config);
  * ------------------------
- * This function places an entry in the users .TaRTrc file and sets the value
+ * This function places an entry in the users .tartrc file and sets the value
  * to 'state'. This is used to determine whether TaRT is running or not.
  * Returns -1 on error, 0 on success;
  * config is a pointer to char malloc'd by sscanf
@@ -281,7 +281,7 @@
         strncpy (PathToINI, "Choices$Write:TaRT.rc", 90);
 #else
 		strncpy (PathToINI, getenv ("HOME"), 90);	/*  find user's homedir */
-		strncat (PathToINI, "/.TaRTrc", 165);
+		strncat (PathToINI, "/.tartrc", 165);
 #endif
 	} else
 	{
@@ -305,8 +305,8 @@
 /* function: WriteINIFile
  * usage: i = WriteINIFile(custom1, custom2, customfile, sigfile, tagfile, config);
  * -------------------------
- * This function writes the file .TaRTrc from the provided variables.
- * .TaRTrc is assumed to be in the users home directory.
+ * This function writes the file .tartrc from the provided variables.
+ * .tartrc is assumed to be in the users home directory.
  * custom1 and custom2 are strings of length TAGLEN (maximum).
  * customfile, sigfile and tagfile are strings of length 256 (maximum).
  * config is a pointer to char malloc'd by sscanf
@@ -333,7 +333,7 @@
         strncpy (PathToINI, "Choices$Write:TaRT.rc", 90);
 #else
 		strncpy (PathToINI, getenv ("HOME"), 90);	/*  find user's homedir */
-		strncat (PathToINI, "/.TaRTrc", 165);
+		strncat (PathToINI, "/.tartrc", 165);
 #endif
 	} else
 	{
@@ -415,7 +415,7 @@
 /* function: FirstINIFile
  * usage: i = FirstINIFile(custom1, custom2, customfile, sigfile, tagfile, datefile, optarray);
  * -------------------------
- * This file creates a .TaRTrc file if one is not found when TaRT is ran.
+ * This file creates a .tartrc file if one is not found when TaRT is run.
  */
 
 int FirstINIFile (char custom1[], char custom2[], char customfile[], char sigfile[], char tagfile[], char datefile[], int optarray[]
@@ -439,7 +439,7 @@
         strncpy(PathToINI, "<Choices$Write>.TaRT.rc",90);
 #else
         strncpy (PathToINI, getenv ("HOME"), 90);       /*  find user's homedir */
-        strcat (PathToINI, "/.TaRTrc");
+        strcat (PathToINI, "/.tartrc");
 #endif
 
 	IniFile = fopen(PathToINI, "w");