Skip to content

Commit 6cb7e9f

Browse files
committed
Rename conv36 to cat36 since it can now concatenate files.
1 parent d543ea3 commit 6cb7e9f

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
*~
22
*.o
3-
conv36
3+
cat36
44
ipak
55
itsarc
66
dis10

Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ WORDS = aa-word.o bin-word.o cadr-word.o core-word.o data8-word.o \
1010
OBJS = pdp10-opc.o info.o dis.o symbols.o \
1111
timing.o timing_ka10.o timing_ki10.o memory.o weenix.o
1212

13-
UTILS = conv36 itsarc magdmp magfrm dskdmp \
13+
UTILS = cat36 itsarc magdmp magfrm dskdmp \
1414
macdmp macro-tapes tape-dir harscntopbm palx \
1515
ipak kldcp klfedr scrmbl unscr tvpic tito dart od10
1616

@@ -33,7 +33,7 @@ libfiles.a: file.o $(FILES)
3333
libwords.a: word.o $(WORDS)
3434
ar -crs $@ $^
3535

36-
conv36: conv36.o libwords.a
36+
cat36: cat36.o libwords.a
3737
$(CC) $(CFLAGS) $^ -o $@
3838

3939
dskdmp: dskdmp.c $(OBJS) libwords.a
@@ -143,11 +143,11 @@ out/%.ipak: samples/% ipak test/%.ipak
143143
./ipak -t $($<) $< 2> $@
144144
cmp $@ test/$*.ipak || rm $@ /no-such-file
145145

146-
out/%.scrmbl: samples/zeros.%.scrmbl scrmbl conv36 samples/zeros.scrmbl
146+
out/%.scrmbl: samples/zeros.%.scrmbl scrmbl cat36 samples/zeros.scrmbl
147147
./scrmbl -Wbin $* samples/zeros.scrmbl $@
148-
./conv36 -Wits -Xbin $@ | cmp - $< || rm $@ /no-such-file
148+
./cat36 -Wits -Xbin $@ | cmp - $< || rm $@ /no-such-file
149149
./scrmbl -d -Wits $* $@ out/$*.unscrm
150-
./conv36 -Wits -Xbin out/$*.unscrm | cmp - samples/zeros.scrmbl \
150+
./cat36 -Wits -Xbin out/$*.unscrm | cmp - samples/zeros.scrmbl \
151151
|| rm $@ /no-such-file
152152

153153
FIX_TIME=sed 's/RECORDED ....-..-.. ..:..,/RECORDED XXXX-XX-XX XX:XX/'
@@ -160,7 +160,7 @@ out/%.dart: samples/% dart test/%.dart
160160

161161
#dependencies
162162
bin-word.o: bin-word.c dis.h
163-
conv36.o: dis.h
163+
cat36.o: dis.h
164164
data8-word.o: data8-word.c dis.h
165165
dis.o: dis.c opcode/pdp10.h dis.h memory.h timing.h
166166
info.o: info.c dis.h memory.h

conv36.c renamed to cat36.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ tape mark.
2626
Here are some interesting use cases:
2727
2828
1. Convert a file from one word format to another.
29-
conv36 -Wformat1 -Xformat2 input > output
29+
cat36 -Wformat1 -Xformat2 input > output
3030
3131
2. Convert between tape image formats.
32-
conv36 -Wtape7 -Xtape tape > output
32+
cat36 -Wtape7 -Xtape tape > output
3333
3434
3. Copy several input files to a tape.
35-
conv36 -Wformat1 -Xtape -Bblocksize input1 input2 input3 > output
35+
cat36 -Wformat1 -Xtape -Bblocksize input1 input2 input3 > output
3636
3737
4. Concatenate several tapes into one.
38-
conv36 -Wtape -Xtape tape1 tape2 tape3 > output */
38+
cat36 -Wtape -Xtape tape1 tape2 tape3 > output */
3939

4040
#include <errno.h>
4141
#include <stdio.h>

0 commit comments

Comments
 (0)