Mercurial > hg > xemacs-beta
view netinstall/hash.cc @ 5211:cdca98f2d36f
Move `default-file-system-ignore-case' to C; fix bug in directory hash tables
src/ChangeLog addition:
2010-05-16 Aidan Kehoe <kehoea@parhasard.net>
Move `default-file-system-ignore-case' to C; pay attention to it
in creating the directory hash tables for #'locate-file. Fix a bug
where #'eq was specified when creating directory hash tables in
dired.c.
* config.h.in (DEFAULT_FILE_SYSTEM_IGNORE_CASE): This is 1 on
Darwin.
* dired.c (make_directory_hash_table): If
#'file-system-ignore-case-p gives non-nil for a directory, created
the associated hash table with #'equalp as its test. Never use
#'eq as a directory hash table test.
* fileio.c (vars_of_fileio):
Move `default-file-system-ignore-case' here, so it can be a
constant boolean reflecting a compile-time #define.
* lisp.h: Update the declaration of make_directory_hash_table;
remove the declaration of wasteful_word_to_lisp, which was
#ifdef'd out.
* lread.c (Flocate_file): Take out a debugging statement from
this function.
(locate_file_refresh_hashing): Call make_directory_hash_table with
a Lisp string, not an Ibyte pointer.
(vars_of_lread): If DEFAULT_FILE_SYSTEM_IGNORE_CASE is defined,
use #'equalp as the hash table test for locate-file-hash-table,
not #'equal.
* s/win32-common.h (DEFAULT_FILE_SYSTEM_IGNORE_CASE):
Case should normally be ignored in file names on Win32.
lisp/ChangeLog addition:
2010-05-16 Aidan Kehoe <kehoea@parhasard.net>
* files.el (default-file-system-ignore-case):
Move this to fileio.c, where it's a constant boolean variable
initialised at dump time.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 16 May 2010 12:33:21 +0100 |
parents | 3078fd1074e8 |
children |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* Simple hash class for install.cc */ #include "win32.h" #include <stdlib.h> #include <string.h> #include "hash.h" class hash_internals { public: char **keys; int numkeys; int maxkeys; int prev_index; }; hash::hash () { h = new hash_internals; h->numkeys = 0; h->maxkeys = 10; h->keys = (char **) malloc (h->maxkeys * sizeof (char *)); h->prev_index = 0; } hash::~hash () { free (h->keys); free (h); } void hash::add (char *string) { int i; for (i=0; i<h->numkeys; i++) if (strcmp (h->keys[i], string) == 0) return; if (h->numkeys >= h->maxkeys) { h->maxkeys += 10; h->keys = (char **) realloc (h->keys, h->maxkeys * sizeof (char *)); } h->keys[h->numkeys] = _strdup (string); h->numkeys ++; } int hash::has (char *string) { int i; for (i=0; i<h->numkeys; i++) if (strcmp (h->keys[i], string) == 0) return 1; return 0; } char * hash::enumerate (char *prev) { if (prev == 0) h->prev_index = -1; h->prev_index ++; if (h->prev_index >= h->numkeys) return 0; return h->keys[h->prev_index]; } static int CDECL rev_len (const void *va, const void *vb) { char *a = *(char **)va; char *b = *(char **)vb; return strcmp (b, a); } void hash::reverse_sort () { qsort (h->keys, h->numkeys, sizeof (h->keys[0]), rev_len); }