Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.7/250-sh-chop-linux-version.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu Apr 26 19:55:59 2012 -0600 (2012-04-26)
changeset 2939 58974be61289
permissions -rw-r--r--
Allow multi-word "install" command.

Autoconf can determine that the correct install command includes flags,
e.g., "/usr/bin/install -c". When using this as a command, we can't
enclose the value in double-quotes, as that makes some shells use the
whole expression as a filename:

# this is the value returned by autoconf and stored in CT_install
$ ins="/usr/bin/install -c"

# if we call it with quotes, the command is not found
$ "${ins}"
bash: /usr/bin/install -c: No such file or directory

# removing the quotes lets it work as expected
$ ${ins}
/usr/bin/install: missing file operand
Try `/usr/bin/install --help' for more information.

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com> 
     1 --- glibc-2.7/sysdeps/unix/sysv/linux/dl-osinfo.h.orig	2007-09-15 23:54:08.000000000 +0100

     2 +++ glibc-2.7/sysdeps/unix/sysv/linux/dl-osinfo.h	2008-08-20 09:26:26.000000000 +0100

     3 @@ -83,6 +83,10 @@

     4    int parts;

     5    char *cp;

     6    struct utsname uts;

     7 +  int dotsfound = 0;

     8 +  int versionindex = 0;

     9 +  char *choppoint;

    10 +

    11  

    12    /* Try the uname system call.  */

    13    if (__uname (&uts))

    14 @@ -102,8 +106,34 @@

    15    else

    16      buf = uts.release;

    17  

    18 +  /* We are only interested in the first three kernel numbers, so */

    19 +  /* chop off anything past that: */

    20 +

    21 +  choppoint = buf;

    22 +  while (1)

    23 +    {

    24 +      versionindex++;

    25 +      if (versionindex == 63) break;

    26 +      if (*choppoint == '.') dotsfound++;

    27 +      choppoint++;

    28 +      if (dotsfound == 2)

    29 +      {

    30 +        if (*choppoint == '0' || *choppoint == '1'

    31 +          || *choppoint == '2' || *choppoint == '3'

    32 +          || *choppoint == '4' || *choppoint == '5'

    33 +          || *choppoint == '6' || *choppoint == '7'

    34 +          || *choppoint == '8' || *choppoint == '9')

    35 +          continue;

    36 +        else

    37 +          {

    38 +            *choppoint = 0;

    39 +            break;

    40 +          }

    41 +      }

    42 +    }

    43 +

    44    /* Now convert it into a number.  The string consists of at most

    45 -     three parts.  */

    46 +     three parts.  Now it does, anyway.  ;-)  */

    47    version = 0;

    48    parts = 0;

    49    cp = buf;
crosstool-ng