CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-18 01:40:06 +02:00
Code Issues Projects Releases Wiki Activity

(tempname): Replace `16' with a more readable expansion.

Browse Source 
Make sure that SEQ never exceeds 99999.
This commit is contained in:
Jim Meyering
1995-09-14 13:31:52 +00:00
parent 800e219a2d
commit b23b6bbcf7
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sort.c
View File

@@ -314,17 +314,23 @@ xfwrite (buf, size, nelem, fp)
static char *
tempname ()
{
static int seq;
static unsigned int seq;
int len = strlen (temp_file_prefix);
char *name = xmalloc (len + 16);
struct tempnode *node =
(struct tempnode *) xmalloc (sizeof (struct tempnode));
char *name = xmalloc (len + 1 + sizeof ("sort") - 1 + 5 + 5 + 1);
struct tempnode *node;
node = (struct tempnode *) xmalloc (sizeof (struct tempnode));
sprintf (name,
"%s%ssort%5.5d%5.5d",
temp_file_prefix,
(len && temp_file_prefix[len - 1] != '/') ? "/" : "",
(unsigned int) getpid () & 0xffff, ++seq);
(unsigned int) getpid () & 0xffff, seq);
/* Make sure that SEQ's value fits in 5 digits. */
++seq;
if (seq >= 100000)
seq = 0;
node->name = name;
node->next = temphead.next;
temphead.next = node;
@@ -657,7 +663,8 @@ numcompare (a, b)
{
register int tmpa, tmpb, loga, logb, tmp;
tmpa = UCHAR (*a), tmpb = UCHAR (*b);
tmpa = UCHAR (*a);
tmpb = UCHAR (*b);
while (blanks[tmpa])
tmpa = UCHAR (*++a);