summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-09-14 08:51:23 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-09-14 08:51:23 (GMT)
commitb1264cd184de3c9ba370ae1e9cb9bb029b12872b (patch)
tree2ac418b3d2c9c918fde5c909ab91f26af057e8c2
parent92eea63a7df5071fddef9b89b9122a5761670908 (diff)
downloadtcl-b1264cd184de3c9ba370ae1e9cb9bb029b12872b.zip
tcl-b1264cd184de3c9ba370ae1e9cb9bb029b12872b.tar.gz
tcl-b1264cd184de3c9ba370ae1e9cb9bb029b12872b.tar.bz2
Add back -wrapchar option to "binary encode uuencode".
-rw-r--r--doc/binary.n9
-rw-r--r--generic/tclBinary.c25
-rw-r--r--tests/binary.test17
3 files changed, 31 insertions, 20 deletions
diff --git a/doc/binary.n b/doc/binary.n
index 95be36e..9f22fb1 100644
--- a/doc/binary.n
+++ b/doc/binary.n
@@ -64,7 +64,7 @@ Indicates that the output should be split into lines of no more than
.
Indicates that, when lines are split because of the \fB\-maxlen\fR option,
\fIcharacter\fR should be used to separate lines. By default, this is a
-newline character,
+newline character.
.QW \en .
.PP
During decoding, the following options are supported:
@@ -102,6 +102,13 @@ During encoding, the following options are supported:
Indicates that the output should be split into lines of no more than
\fIlength\fR characters. By default, lines are split every 61 characters, and
this must be in the range 3 to 85 due to limitations in the encoding.
+.TP
+\fB\-wrapchar \fIcharacter\fR
+.
+Indicates that, when lines are split because of the \fB\-maxlen\fR option,
+\fIcharacter\fR should be used to separate lines. By default, this is a
+newline character.
+.QW \en .
.PP
During decoding, the following options are supported:
.TP
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 71da309..98a4d31 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -2584,13 +2584,15 @@ BinaryEncodeUu(
{
Tcl_Obj *resultObj;
unsigned char *data, *start, *cursor;
- int offset, count, rawLength, n, i, bits, index;
+ int offset, count, rawLength, n, i, j, bits, index;
int lineLength = 61;
- enum {OPT_MAXLEN};
- static const char *const optStrings[] = { "-maxlen", NULL };
+ const char *wrapchar = "\n";
+ int wrapcharlen = 1;
+ enum {OPT_MAXLEN, OPT_WRAPCHAR };
+ static const char *const optStrings[] = { "-maxlen", "-wrapchar", NULL };
if (objc < 2 || objc%2 != 0) {
- Tcl_WrongNumArgs(interp, 1, objv, "?-maxlen len? data");
+ Tcl_WrongNumArgs(interp, 1, objv, "?-maxlen len? ?-wrapchar char? data");
return TCL_ERROR;
}
for (i = 1; i < objc-1; i += 2) {
@@ -2610,6 +2612,15 @@ BinaryEncodeUu(
return TCL_ERROR;
}
break;
+ case OPT_WRAPCHAR:
+ wrapchar = Tcl_GetStringFromObj(objv[i+1], &wrapcharlen);
+ if (wrapcharlen < 0 || wrapcharlen > 2) {
+ Tcl_SetResult(interp, "wrap char out of range", TCL_STATIC);
+ Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
+ "WRAP_CHAR", NULL);
+ return TCL_ERROR;
+ }
+ break;
}
}
@@ -2623,7 +2634,7 @@ BinaryEncodeUu(
data = Tcl_GetByteArrayFromObj(objv[objc-1], &count);
rawLength = (lineLength - 1) * 3 / 4;
start = cursor = Tcl_SetByteArrayLength(resultObj,
- (lineLength + 1) * ((count + (rawLength - 1)) / rawLength));
+ (lineLength + wrapcharlen) * ((count + (rawLength - 1)) / rawLength));
n = bits = 0;
/*
@@ -2652,7 +2663,9 @@ BinaryEncodeUu(
*cursor++ = UueDigits[(n >> (bits + 2)) & 0x3f];
bits = 0;
}
- *cursor++ = '\n';
+ for (j=0; j<wrapcharlen; ++j) {
+ *cursor++ = wrapchar[j];
+ }
}
/*
diff --git a/tests/binary.test b/tests/binary.test
index 4b71b77..ff1929f 100644
--- a/tests/binary.test
+++ b/tests/binary.test
@@ -2733,23 +2733,14 @@ test binary-74.9 {binary encode uuencode} -body {
} -result {$``````
}
test binary-74.10 {binary encode uuencode} -returnCodes error -body {
- binary encode uuencode -maxlen 30 -wrapchar | abcabcabc
-} -result {bad option "-wrapchar": must be -maxlen}
+ binary encode uuencode -foo 30 abcabcabc
+} -result {bad option "-foo": must be -maxlen or -wrapchar}
test binary-74.11 {binary encode uuencode} -returnCodes error -body {
binary encode uuencode -maxlen 1 abcabcabc
} -result {line length out of range}
test binary-74.12 {binary encode uuencode} -body {
- binary encode uuencode -maxlen 3 abcabcabc
-} -result {!80
-!8@
-!8P
-!80
-!8@
-!8P
-!80
-!8@
-!8P
-}
+ binary encode uuencode -maxlen 3 -wrapchar | abcabcabc
+} -result {!80|!8@|!8P|!80|!8@|!8P|!80|!8@|!8P|}
test binary-75.1 {binary decode uuencode} -body {
binary decode uuencode