lustre/kernel_patches/patches/mkdep-revert-rh-2.4.patch

   1 Index: linux-2.4.20-30.9/scripts/mkdep.c
   2 ===================================================================
   3 --- linux-2.4.20-30.9.orig/scripts/mkdep.c      2004-02-19 19:40:51.000000000 -0500
   4 +++ linux-2.4.20-30.9/scripts/mkdep.c   2004-04-28 17:24:54.000000000 -0400
   5 @@ -48,8 +48,6 @@
   6  char __depname[512] = "\n\t@touch ";
   7  #define depname (__depname+9)
   8  int hasdep;
   9 -char cwd[PATH_MAX];
  10 -int lcwd;
  11
  12  struct path_struct {
  13         int len;
  14 @@ -204,22 +202,8 @@
  15                 memcpy(path->buffer+path->len, name, len);
  16                 path->buffer[path->len+len] = '\0';
  17                 if (access(path->buffer, F_OK) == 0) {
  18 -                       int l = lcwd + strlen(path->buffer);
  19 -                       char name2[l+2], *p;
  20 -                       if (path->buffer[0] == '/') {
  21 -                               memcpy(name2, path->buffer, l+1);
  22 -                       }
  23 -                       else {
  24 -                               memcpy(name2, cwd, lcwd);
  25 -                               name2[lcwd] = '/';
  26 -                               memcpy(name2+lcwd+1, path->buffer, path->len+len+1);
  27 -                       }
  28 -                       while ((p = strstr(name2, "/../"))) {
  29 -                               *p = '\0';
  30 -                               strcpy(strrchr(name2, '/'), p+3);
  31 -                       }
  32                         do_depname();
  33 -                       printf(" \\\n   %s", name2);
  34 +                       printf(" \\\n   %s", path->buffer);
  35                         return;
  36                 }
  37         }
  38 @@ -601,12 +585,6 @@
  39                 return 1;
  40         }
  41
  42 -       if (!getcwd(cwd, sizeof(cwd))) {
  43 -               fprintf(stderr, "mkdep: getcwd() failed %m\n");
  44 -               return 1;
  45 -       }
  46 -       lcwd = strlen(cwd);
  47 -
  48         add_path(".");          /* for #include "..." */
  49
  50         while (++argv, --argc > 0) {