mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2024-11-27 12:04:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

maint: make sc_dd_O_FLAGS more robust

Browse Source 
The construct "diff ... || diff=1 || diff=" does not set the variable
in all cases.  This could be triggered with:

  $ env make diff=1 make sc_dd_O_FLAGS
  dd_O_FLAGS
  maint.mk: ./src/dd.c has inconsistent O_ flag lists
  cfg.mk:59: recipe for target 'sc_dd_O_FLAGS' failed
  make: *** [sc_dd_O_FLAGS] Error 1

* cfg.mk (sc_dd_O_FLAGS): Remember $? of the diff command directly
and check its value later rather than using the  above mentioned
mapping.
This commit is contained in:
Bernhard Voelker 2015-02-09 08:19:01 +01:00
parent ebb71efc1e
commit 99f76aec8a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cfg.mk
View File

@ -61,11 +61,11 @@ sc_dd_O_FLAGS:
perl -nle '/^ +\| (O_\w*)$$/ and print $$1' $(dd); } | sort > $@.1
@{ echo O_NOFOLLOW; perl -nle '/{"[a-z]+",\s*(O_\w+)},/ and print $$1' \
$(dd); } | sort > $@.2
@diff -u $@.1 $@.2 || diff=1 || diff=; \
@diff -u $@.1 $@.2; diff=$$?; \
rm -f $@.1 $@.2; \
test "$$diff" \
&& { echo '$(ME): $(dd) has inconsistent O_ flag lists'>&2; \
exit 1; } || :
test "$$diff" = 0 \
|| { echo '$(ME): $(dd) has inconsistent O_ flag lists'>&2; \
exit 1; }
# Ensure that dd's definition of LONGEST_SYMBOL stays in sync
# with the strings from the two affected variables.