diff options
author | tjr <tjr@FreeBSD.org> | 2005-08-21 06:35:02 +0000 |
---|---|---|
committer | tjr <tjr@FreeBSD.org> | 2005-08-21 06:35:02 +0000 |
commit | 42418979749a47afb8872241d640870728dcce45 (patch) | |
tree | 2eea83d3742e741241c964b22dfe0381093d992d /usr.bin | |
parent | 0a6ac5478294670c743b23a77f331d93033a896a (diff) | |
download | FreeBSD-src-42418979749a47afb8872241d640870728dcce45.zip FreeBSD-src-42418979749a47afb8872241d640870728dcce45.tar.gz |
Remove the hack that varied the first character of the output file name
if none was specified on the command line. This is not permitted by
POSIX, and no longer needed now that we have the -a option.
PR: 85099
Submitted by: Toby Peterson (Apple Computer)
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/split/split.1 | 8 | ||||
-rw-r--r-- | usr.bin/split/split.c | 12 |
2 files changed, 5 insertions, 15 deletions
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1 index 70ed146..1383671 100644 --- a/usr.bin/split/split.1 +++ b/usr.bin/split/split.1 @@ -111,8 +111,8 @@ is not specified, two letters are used as the suffix. If the .Ar name argument is not specified, the file is split into lexically ordered -files named with prefixes in the range of -.Dq Li x-z +files named with the prefix +.Dq Li x and with suffixes as above. .Sh ENVIRONMENT The @@ -139,12 +139,10 @@ A command appeared in .At v3 . .Sh BUGS -For historical reasons, if you specify -.Ar name , +For historical reasons, .Nm can only create 676 separate files. -The default naming convention allows 2028 separate files. The .Fl a option can be used to work around this limitation. diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index ca3847c..e1978be 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -319,16 +319,8 @@ newfile(void) if ((maxfiles *= 26) <= 0) errx(EX_USAGE, "suffix is too long (max %ld)", i); - /* - * Hack to increase max files; original code wandered through - * magic characters. - */ - if (fnum == maxfiles) { - if (!defname || fname[0] == 'z') - errx(EX_DATAERR, "too many files"); - ++fname[0]; - fnum = 0; - } + if (fnum == maxfiles) + errx(EX_DATAERR, "too many files"); /* Generate suffix of sufflen letters */ tfnum = fnum; |