Re: need help with enhancement to prevent completion from stat'ing automounts

[Greg Klanderman <gak@xxxxxxxxxxxxxx>]

>>>>> On September 10, 2009 Peter Stephenson <pws@xxxxxxx> wrote:

>> It's high time we fixed this properly.  The whole problem with the
>> completion system is arbitrary bits getting added without understanding the
>> existing bits, and each time that happens it gets worse.

Hi all,

Just an update on this; since actually adding support for a fake-dirs
zstyle and having both that and the fake-files zstyle not stat the
fake files and directories is quite a bit of work, as a temporary
solution for my company I made a relatively simple change so that in
the interim we can have working completion of automounts, by
introducing an array parameter to configure paths in which stating
should be avoided in the ztat function.

I'm pretty sure Peter isn't interested in committing this fix, but I
figured it was worth posting the patch just in case others out there
also need a temporary solution.

You'd use this for configuring automounts as follows:

  completion_nostat_dirs=( /net /home )
  zstyle ':completion:*' fake-files \
         '/net:netdir1 netdir2 .. netdirN' \
         '/home:homedir1 homedir2 .. homedirM'

In my actual usage I generate those arguments based on the contents of
/etc/auto.* or output of 'ypcat -k auto.*'.

cheers,
Greg


Index: Src/init.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/init.c,v
retrieving revision 1.106
diff -u -r1.106 init.c
--- Src/init.c	12 Jul 2009 15:10:07 -0000	1.106
+++ Src/init.c	13 Nov 2009 20:51:25 -0000
@@ -799,6 +799,8 @@
     modulestab = newmoduletable(17, "modules");
     linkedmodules = znewlinklist();
 
+    completion_nostat_dirs = mkarray(NULL);
+
     /* Set default prompts */
     if(unset(INTERACTIVE)) {
 	prompt = ztrdup("");
Index: Src/params.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/params.c,v
retrieving revision 1.157
diff -u -r1.157 params.c
--- Src/params.c	5 Sep 2009 19:49:20 -0000	1.157
+++ Src/params.c	13 Nov 2009 20:51:25 -0000
@@ -102,6 +102,10 @@
      zoptind,		/* $OPTIND      */
      shlvl;		/* $SHLVL       */
 
+/**/
+mod_export
+char **completion_nostat_dirs;
+
 /* $histchars */
  
 /**/
@@ -343,6 +347,9 @@
 #define IPDEF9(A,B,C) IPDEF9F(A,B,C,0)
 IPDEF9F("*", &pparams, NULL, PM_ARRAY|PM_SPECIAL|PM_DONTIMPORT|PM_READONLY),
 IPDEF9F("@", &pparams, NULL, PM_ARRAY|PM_SPECIAL|PM_DONTIMPORT|PM_READONLY),
+
+IPDEF9("completion_nostat_dirs", &completion_nostat_dirs, NULL),
+
 {{NULL,NULL,0},BR(NULL),NULL_GSU,0,0,NULL,NULL,NULL,0},
 
 #define IPDEF10(A,B) {{NULL,A,PM_ARRAY|PM_SPECIAL},BR(NULL),GSU(B),10,0,NULL,NULL,NULL,0}
Index: Src/Zle/compresult.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/compresult.c,v
retrieving revision 1.78
diff -u -r1.78 compresult.c
--- Src/Zle/compresult.c	24 Apr 2009 09:00:38 -0000	1.78
+++ Src/Zle/compresult.c	13 Nov 2009 20:51:25 -0000
@@ -863,11 +863,37 @@
 ztat(char *nam, struct stat *buf, int ls)
 {
     int ret;
+    char **pp;
 
     nam = unmeta(nam);
     if (!nam)
 	return -1;
 
+    for (pp = completion_nostat_dirs; *pp; pp++) {
+        int len = strlen(*pp);
+
+        if ((*pp)[len-1] == '/')
+            len--;
+
+        if (strncmp(nam, *pp, len) == 0 && nam[len] == '/' && strchr(nam+len+1, '/') == NULL) {
+            buf->st_dev = 0;      /* device */
+            buf->st_ino = 0;      /* inode */
+            buf->st_mode = S_IFDIR;     /* protection */
+            buf->st_nlink = 0;    /* number of hard links */
+            buf->st_uid = 0;      /* user ID of owner */
+            buf->st_gid = 0;      /* group ID of owner */
+            buf->st_rdev = 0;     /* device type (if inode device) */
+            buf->st_size = 0;     /* total size, in bytes */
+            buf->st_blksize = 0;  /* blocksize for filesystem I/O */
+            buf->st_blocks = 0;   /* number of blocks allocated */
+            buf->st_atime = 0;    /* time of last access */
+            buf->st_mtime = 0;    /* time of last modification */
+            buf->st_ctime = 0;    /* time of last status change */
+
+            return 0;
+        }
+    }
+
     if ((ret = ls ? lstat(nam, buf) : stat(nam, buf))) {
 	char *p, *q;