Changeset 4075

Show
Ignore:
Timestamp:
05/13/06 10:04:35 (3 years ago)
Author:
miyoshi
Message:

(Fdos_to_unix_filename): Allocate memory for a file name
on the stack.
(Funix_to_dos_filename): Ditto.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/ChangeLog.Meadow

    r4074 r4075  
     12006-05-13  MIYOSHI Masanori  <miyoshi@meadowy.org> 
     2 
     3        * w32.c (Fdos_to_unix_filename): Allocate memory for a file name 
     4        on the stack. 
     5        (Funix_to_dos_filename): Ditto. 
     6 
    172006-05-13  MIYOSHI Masanori  <miyoshi@meadowy.org> 
    28 

  • trunk/src/w32.c

    r4074 r4075  
    46214621{ 
    46224622  int size; 
    4623   Lisp_Object rfilename; 
    4624   char* filetmp; 
     4623  char filetmp[FILENAME_MAX]; 
    46254624 
    46264625  CHECK_STRING (filename); 
    4627   size = STRING_BYTES (XSTRING (filename)); 
    4628   filetmp = (char *) alloca (size + 1); 
    4629   if (!filetmp) 
    4630     { 
    4631       error ("Cannot allocate memory!."); 
    4632     } 
    4633   memcpy (filetmp, XSTRING (filename)->data, size + 1); 
     4626  size = SBYTES (filename); 
     4627  memcpy (filetmp, SDATA (filename), size + 1); 
    46344628 
    46354629  dostounix_filename (filetmp); 
    …… 
    46464640{ 
    46474641  int size; 
    4648   Lisp_Object rfilename; 
    4649   char *filetmp; 
     4642  char filetmp[FILENAME_MAX]; 
    46504643 
    46514644  CHECK_STRING (filename); 
    4652   size = STRING_BYTES (XSTRING (filename)); 
    4653   filetmp = (char *) alloca (size + 1); 
    4654   if (!filetmp) 
    4655     { 
    4656       error ("Cannot allocate memory!."); 
    4657     } 
    4658   memcpy (filetmp, XSTRING (filename)->data, size + 1); 
     4645  size = SBYTES (filename); 
     4646  memcpy (filetmp, SDATA (filename), size + 1); 
    46594647 
    46604648  unixtodos_filename (filetmp);