[BACK]Return to install-sh CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / external / mit / expat / dist / conftools

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/external/mit/expat/dist/conftools/install-sh between version 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2017/02/04 10:16:05 version 1.1.1.5, 2019/09/16 06:21:04
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # install - install a program, script, or datafile  # install - install a program, script, or datafile
   
 scriptversion=2013-12-25.23; # UTC  scriptversion=2016-01-11.22; # UTC
   
 # This originates from X11R5 (mit/util/scripts/install.sh), which was  # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the  # later released in X11R6 (xc/config/util/install.sh) with the
Line 324  do
Line 324  do
             # is incompatible with FreeBSD 'install' when (umask & 300) != 0.              # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
             ;;              ;;
           *)            *)
               # $RANDOM is not portable (e.g. dash);  use it when possible to
               # lower collision chance
             tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$              tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
             trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0              trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
   
               # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
               # create the $tmpdir first (and fail if unsuccessful) to make sure
               # that nobody tries to guess the $tmpdir name.
             if (umask $mkdir_umask &&              if (umask $mkdir_umask &&
                 exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1                  $mkdirprog $mkdir_mode "$tmpdir" &&
                   exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
             then              then
               if test -z "$dir_arg" || {                if test -z "$dir_arg" || {
                    # Check for POSIX incompatibilities with -m.                     # Check for POSIX incompatibilities with -m.
                    # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or                     # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
                    # other-writable bit of parent directory when it shouldn't.                     # other-writable bit of parent directory when it shouldn't.
                    # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.                     # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
                    ls_ld_tmpdir=`ls -ld "$tmpdir"`                     test_tmpdir="$tmpdir/a"
                      ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
                    case $ls_ld_tmpdir in                     case $ls_ld_tmpdir in
                      d????-?r-*) different_mode=700;;                       d????-?r-*) different_mode=700;;
                      d????-?--*) different_mode=755;;                       d????-?--*) different_mode=755;;
                      *) false;;                       *) false;;
                    esac &&                     esac &&
                    $mkdirprog -m$different_mode -p -- "$tmpdir" && {                     $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
                      ls_ld_tmpdir_1=`ls -ld "$tmpdir"`                       ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
                      test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"                       test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
                    }                     }
                  }                   }
               then posix_mkdir=:                then posix_mkdir=:
               fi                fi
               rmdir "$tmpdir/d" "$tmpdir"                rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
             else              else
               # Remove any dirs left behind by ancient mkdir implementations.                # Remove any dirs left behind by ancient mkdir implementations.
               rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null                rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
             fi              fi
             trap '' 0;;              trap '' 0;;
         esac;;          esac;;
Line 496  done
Line 503  done
 # eval: (add-hook 'write-file-hooks 'time-stamp)  # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="  # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"  # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC"  # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"  # time-stamp-end: "; # UTC"
 # End:  # End:
Legend:
Removed from v.1.1.1.4  
changed lines
  Added in v.1.1.1.5
CVSweb <webmaster@jp.NetBSD.org>