comparison src/dired.c @ 5125:b5df3737028a ben-lisp-object

merge
author Ben Wing <ben@xemacs.org>
date Wed, 24 Feb 2010 01:58:04 -0600
parents 16112448d484
children 99f8ebc082d9 861f2601a38b
comparison
equal deleted inserted replaced
5124:623d57b7fbe8 5125:b5df3737028a
369 if (! DIRENTRY_NONEMPTY (dp) 369 if (! DIRENTRY_NONEMPTY (dp)
370 || cclen < file_name_length 370 || cclen < file_name_length
371 || 0 <= scmp (d_name, XSTRING_DATA (file), file_name_length)) 371 || 0 <= scmp (d_name, XSTRING_DATA (file), file_name_length))
372 continue; 372 continue;
373 373
374 if (file_name_completion_stat (directory, dp, &st) < 0) 374 /* Ignore file-too-large conditions; the mode is still filled in. */
375 continue; 375 if (file_name_completion_stat (directory, dp, &st) < 0 &&
376 errno != EOVERFLOW)
377 continue;
376 378
377 directoryp = ((st.st_mode & S_IFMT) == S_IFDIR); 379 directoryp = ((st.st_mode & S_IFMT) == S_IFDIR);
378 if (directoryp) 380 if (directoryp)
379 { 381 {
380 #ifndef TRIVIAL_DIRECTORY_ENTRY 382 #ifndef TRIVIAL_DIRECTORY_ENTRY
574 static void 576 static void
575 free_user_cache (struct user_cache *cache) 577 free_user_cache (struct user_cache *cache)
576 { 578 {
577 int i; 579 int i;
578 for (i = 0; i < cache->length; i++) 580 for (i = 0; i < cache->length; i++)
579 xfree (cache->user_names[i].ptr, Ibyte *); 581 xfree (cache->user_names[i].ptr);
580 xfree (cache->user_names, struct user_name *); 582 xfree (cache->user_names);
581 xzero (*cache); 583 xzero (*cache);
582 } 584 }
583 585
584 static Lisp_Object 586 static Lisp_Object
585 user_name_completion_unwind (Lisp_Object cache_incomplete_p) 587 user_name_completion_unwind (Lisp_Object cache_incomplete_p)