summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.dir-locals.el5
-rw-r--r--src/basic/af-to-name.awk10
-rw-r--r--src/basic/arphrd-to-name.awk10
-rw-r--r--src/basic/cap-to-name.awk10
-rw-r--r--src/basic/errno-to-name.awk11
-rwxr-xr-xsrc/basic/generate-af-list.sh4
-rwxr-xr-xsrc/basic/generate-arphrd-list.sh4
-rwxr-xr-xsrc/basic/generate-cap-list.sh4
-rwxr-xr-xsrc/basic/generate-errno-list.sh2
-rwxr-xr-xsrc/boot/efi/no-undefined-symbols.sh4
-rw-r--r--src/core/load-fragment-gperf-nulstr.awk14
-rw-r--r--src/journal/audit_type-to-name.awk8
-rwxr-xr-xsrc/journal/generate-audit_type-list.sh8
-rw-r--r--src/resolve/dns_type-to-name.awk14
-rw-r--r--src/test/test-hashmap-ordered.awk14
-rwxr-xr-xsrc/udev/generate-keyboard-keys-list.sh2
-rwxr-xr-xtest/test-efi-create-disk.sh14
-rwxr-xr-xtools/meson-check-help.sh14
-rwxr-xr-xtools/meson-git-contrib.sh8
-rwxr-xr-xtools/meson-make-symlink.sh4
-rwxr-xr-xunits/meson-add-wants.sh24
21 files changed, 109 insertions, 79 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
index 9dfdbe3fe2..5ef7e11634 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -21,4 +21,7 @@
(eval . (c-set-offset 'arglist-close 0))))
(nxml-mode . ((nxml-child-indent . 2)
(fill-column . 119)))
- (meson-mode . ((meson-indent-basic . 8))))
+ (meson-mode . ((meson-indent-basic . 8)))
+ (sh-mode . ((sh-basic-offset . 8)
+ (sh-indentation . 8)))
+ (awk-mode . ((c-basic-offset . 8))))
diff --git a/src/basic/af-to-name.awk b/src/basic/af-to-name.awk
index e20830487f..18d0a89728 100644
--- a/src/basic/af-to-name.awk
+++ b/src/basic/af-to-name.awk
@@ -1,5 +1,9 @@
-BEGIN{ print "static const char* const af_names[] = { "}
+BEGIN{
+ print "static const char* const af_names[] = { "
+}
!/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ {
- printf " [%s] = \"%s\",\n", $1, $1
+ printf " [%s] = \"%s\",\n", $1, $1
+}
+END{
+ print "};"
}
-END{print "};"}
diff --git a/src/basic/arphrd-to-name.awk b/src/basic/arphrd-to-name.awk
index 57e4680f17..5a35673e2c 100644
--- a/src/basic/arphrd-to-name.awk
+++ b/src/basic/arphrd-to-name.awk
@@ -1,5 +1,9 @@
-BEGIN{ print "static const char* const arphrd_names[] = { "}
+BEGIN{
+ print "static const char* const arphrd_names[] = { "
+}
!/CISCO/ {
- printf " [ARPHRD_%s] = \"%s\",\n", $1, $1
+ printf " [ARPHRD_%s] = \"%s\",\n", $1, $1
+}
+END{
+ print "};"
}
-END{print "};"}
diff --git a/src/basic/cap-to-name.awk b/src/basic/cap-to-name.awk
index d252291851..402a782024 100644
--- a/src/basic/cap-to-name.awk
+++ b/src/basic/cap-to-name.awk
@@ -1,5 +1,9 @@
-BEGIN{ print "static const char* const capability_names[] = { "}
+BEGIN{
+ print "static const char* const capability_names[] = { "
+}
{
- printf " [%s] = \"%s\",\n", $1, tolower($1)
+ printf " [%s] = \"%s\",\n", $1, tolower($1)
+}
+END{
+ print "};"
}
-END{print "};"}
diff --git a/src/basic/errno-to-name.awk b/src/basic/errno-to-name.awk
index c48c8f93ab..0878abacbd 100644
--- a/src/basic/errno-to-name.awk
+++ b/src/basic/errno-to-name.awk
@@ -1,4 +1,9 @@
-BEGIN{ print "static const char* const errno_names[] = { " }
+BEGIN{
+ print "static const char* const errno_names[] = { "
+}
!/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ {
- printf " [%s] = \"%s\",\n", $1, $1 }
-END{ print "};" }
+ printf " [%s] = \"%s\",\n", $1, $1
+}
+END{
+ print "};"
+}
diff --git a/src/basic/generate-af-list.sh b/src/basic/generate-af-list.sh
index 733cf59dd0..8d9cdd1836 100755
--- a/src/basic/generate-af-list.sh
+++ b/src/basic/generate-af-list.sh
@@ -1,5 +1,5 @@
#!/bin/sh -eu
$1 -E -dM -include sys/socket.h - </dev/null | \
- grep -Ev 'AF_UNSPEC|AF_MAX' | \
- awk '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $2; }'
+ grep -Ev 'AF_UNSPEC|AF_MAX' | \
+ awk '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $2; }'
diff --git a/src/basic/generate-arphrd-list.sh b/src/basic/generate-arphrd-list.sh
index 3c2bc5483d..ee207fb38e 100755
--- a/src/basic/generate-arphrd-list.sh
+++ b/src/basic/generate-arphrd-list.sh
@@ -1,5 +1,5 @@
#!/bin/sh -eu
$1 -dM -include net/if_arp.h - </dev/null | \
- awk '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $2; }' | \
- sed -e 's/ARPHRD_//'
+ awk '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $2; }' | \
+ sed -e 's/ARPHRD_//'
diff --git a/src/basic/generate-cap-list.sh b/src/basic/generate-cap-list.sh
index 3ac3544539..1d4a562e7c 100755
--- a/src/basic/generate-cap-list.sh
+++ b/src/basic/generate-cap-list.sh
@@ -1,5 +1,5 @@
#!/bin/sh -eu
$1 -dM -include linux/capability.h -include "$2" -include "$3" - </dev/null | \
- awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \
- grep -v CAP_LAST_CAP
+ awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \
+ grep -v CAP_LAST_CAP
diff --git a/src/basic/generate-errno-list.sh b/src/basic/generate-errno-list.sh
index a8b4938644..e2bab8b320 100755
--- a/src/basic/generate-errno-list.sh
+++ b/src/basic/generate-errno-list.sh
@@ -1,4 +1,4 @@
#!/bin/sh -eu
$1 -dM -include errno.h - </dev/null | \
- awk '/^#define[ \t]+E[^ _]+[ \t]+/ { print $2; }'
+ awk '/^#define[ \t]+E[^ _]+[ \t]+/ { print $2; }'
diff --git a/src/boot/efi/no-undefined-symbols.sh b/src/boot/efi/no-undefined-symbols.sh
index 14a1a087bb..08b266c455 100755
--- a/src/boot/efi/no-undefined-symbols.sh
+++ b/src/boot/efi/no-undefined-symbols.sh
@@ -1,6 +1,6 @@
#!/bin/sh -eu
if nm -D -u "$1" | grep ' U '; then
- echo "Undefined symbols detected!"
- exit 1
+ echo "Undefined symbols detected!"
+ exit 1
fi
diff --git a/src/core/load-fragment-gperf-nulstr.awk b/src/core/load-fragment-gperf-nulstr.awk
index bc66ff221d..b52438abe3 100644
--- a/src/core/load-fragment-gperf-nulstr.awk
+++ b/src/core/load-fragment-gperf-nulstr.awk
@@ -1,12 +1,14 @@
BEGIN{
- keywords=0 ; FS="," ;
- print "extern const char load_fragment_gperf_nulstr[];" ;
- print "const char load_fragment_gperf_nulstr[] ="
+ keywords=0 ; FS="," ;
+ print "extern const char load_fragment_gperf_nulstr[];" ;
+ print "const char load_fragment_gperf_nulstr[] ="
}
keyword==1 {
- print "\"" $$1 "\\0\""
+ print "\"" $$1 "\\0\""
}
/%%/ {
- keyword=1
+ keyword=1
+}
+END {
+ print ";"
}
-END { print ";" }
diff --git a/src/journal/audit_type-to-name.awk b/src/journal/audit_type-to-name.awk
index 38a4b05321..44fc702eb3 100644
--- a/src/journal/audit_type-to-name.awk
+++ b/src/journal/audit_type-to-name.awk
@@ -1,5 +1,9 @@
-BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" }
+BEGIN{
+ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {"
+}
{
printf " case AUDIT_%s: return \"%s\";\n", $1, $1
}
-END{ print " default: return NULL;\n\t}\n}\n" }
+END{
+ print " default: return NULL;\n\t}\n}\n"
+}
diff --git a/src/journal/generate-audit_type-list.sh b/src/journal/generate-audit_type-list.sh
index c9476b7809..18cbe0599c 100755
--- a/src/journal/generate-audit_type-list.sh
+++ b/src/journal/generate-audit_type-list.sh
@@ -5,10 +5,10 @@ shift
includes=""
for i in "$@"; do
- includes="$includes -include $i"
+ includes="$includes -include $i"
done
$cpp -dM $includes - </dev/null | \
- grep -vE 'AUDIT_.*(FIRST|LAST)_' | \
- sed -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | \
- sort -k2
+ grep -vE 'AUDIT_.*(FIRST|LAST)_' | \
+ sed -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | \
+ sort -k2
diff --git a/src/resolve/dns_type-to-name.awk b/src/resolve/dns_type-to-name.awk
index 64d675b0a9..badb1824b5 100644
--- a/src/resolve/dns_type-to-name.awk
+++ b/src/resolve/dns_type-to-name.awk
@@ -1,7 +1,11 @@
-BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" }
+BEGIN{
+ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {"
+}
{
- printf " case DNS_TYPE_%s: return ", $1;
- sub(/_/, "-");
- printf "\"%s\";\n", $1
+ printf " case DNS_TYPE_%s: return ", $1;
+ sub(/_/, "-");
+ printf "\"%s\";\n", $1
+}
+END{
+ print " default: return NULL;\n\t}\n}\n"
}
-END{ print " default: return NULL;\n\t}\n}\n" }
diff --git a/src/test/test-hashmap-ordered.awk b/src/test/test-hashmap-ordered.awk
index 4e75a4655a..10f4386fa4 100644
--- a/src/test/test-hashmap-ordered.awk
+++ b/src/test/test-hashmap-ordered.awk
@@ -1,11 +1,11 @@
BEGIN {
- print "/* GENERATED FILE */";
- print "#define ORDERED"
+ print "/* GENERATED FILE */";
+ print "#define ORDERED"
}
{
- if (!match($0, "^#include"))
- gsub(/hashmap/, "ordered_hashmap");
- gsub(/HASHMAP/, "ORDERED_HASHMAP");
- gsub(/Hashmap/, "OrderedHashmap");
- print
+ if (!match($0, "^#include"))
+ gsub(/hashmap/, "ordered_hashmap");
+ gsub(/HASHMAP/, "ORDERED_HASHMAP");
+ gsub(/Hashmap/, "OrderedHashmap");
+ print
}
diff --git a/src/udev/generate-keyboard-keys-list.sh b/src/udev/generate-keyboard-keys-list.sh
index 5fb5ed0bbe..479e493182 100755
--- a/src/udev/generate-keyboard-keys-list.sh
+++ b/src/udev/generate-keyboard-keys-list.sh
@@ -1,4 +1,4 @@
#!/bin/sh -eu
$1 -dM -include linux/input.h - </dev/null | \
- awk '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($2 != "KEY_MAX") { print $2 } }'
+ awk '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($2 != "KEY_MAX") { print $2 } }'
diff --git a/test/test-efi-create-disk.sh b/test/test-efi-create-disk.sh
index d3a8b5f8ed..0216c83c12 100755
--- a/test/test-efi-create-disk.sh
+++ b/test/test-efi-create-disk.sh
@@ -5,7 +5,7 @@ systemd_efi="$2"
boot_stub="$3"
splash_bmp="$4"
if [ -z "$out" -o -z "$systemd_efi" -o -z "$boot_stub" -o -z "$splash_bmp" ]; then
- exit 1
+ exit 1
fi
# create GPT table with EFI System Partition
@@ -27,12 +27,12 @@ cp "$systemd_efi" mnt/EFI/BOOT/BOOTX64.efi
mkdir mnt/EFI/Linux
echo -n "foo=yes bar=no root=/dev/fakeroot debug rd.break=initqueue" >mnt/cmdline.txt
objcopy \
- --add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \
- --add-section .cmdline=mnt/cmdline.txt --change-section-vma .cmdline=0x30000 \
- --add-section .splash="$splash_bmp" --change-section-vma .splash=0x40000 \
- --add-section .linux=/boot/$(cat /etc/machine-id)/$(uname -r)/linux --change-section-vma .linux=0x2000000 \
- --add-section .initrd=/boot/$(cat /etc/machine-id)/$(uname -r)/initrd --change-section-vma .initrd=0x3000000 \
- "$boot_stub" mnt/EFI/Linux/linux-test.efi
+ --add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \
+ --add-section .cmdline=mnt/cmdline.txt --change-section-vma .cmdline=0x30000 \
+ --add-section .splash="$splash_bmp" --change-section-vma .splash=0x40000 \
+ --add-section .linux=/boot/$(cat /etc/machine-id)/$(uname -r)/linux --change-section-vma .linux=0x2000000 \
+ --add-section .initrd=/boot/$(cat /etc/machine-id)/$(uname -r)/initrd --change-section-vma .initrd=0x3000000 \
+ "$boot_stub" mnt/EFI/Linux/linux-test.efi
# install entries
mkdir -p mnt/loader/entries
diff --git a/tools/meson-check-help.sh b/tools/meson-check-help.sh
index 7102866a5c..47a5099a04 100755
--- a/tools/meson-check-help.sh
+++ b/tools/meson-check-help.sh
@@ -2,19 +2,19 @@
# output width
if "$1" --help | grep -v 'default:' | grep -E -q '.{80}.'; then
- echo "$(basename "$1") --help output is too wide:"
- "$1" --help | awk 'length > 80' | grep -E --color=yes '.{80}'
- exit 1
+ echo "$(basename "$1") --help output is too wide:"
+ "$1" --help | awk 'length > 80' | grep -E --color=yes '.{80}'
+ exit 1
fi
# no --help output to stdout
if "$1" --help 2>&1 1>/dev/null | grep .; then
- echo "$(basename "$1") --help prints to stderr"
- exit 2
+ echo "$(basename "$1") --help prints to stderr"
+ exit 2
fi
# error output to stderr
if ! "$1" --no-such-parameter 2>&1 1>/dev/null | grep -q .; then
- echo "$(basename "$1") with an unknown parameter does not print to stderr"
- exit 3
+ echo "$(basename "$1") with an unknown parameter does not print to stderr"
+ exit 3
fi
diff --git a/tools/meson-git-contrib.sh b/tools/meson-git-contrib.sh
index ac031638e0..1c614ef511 100755
--- a/tools/meson-git-contrib.sh
+++ b/tools/meson-git-contrib.sh
@@ -1,7 +1,7 @@
#!/bin/sh -eu
git shortlog -s `git describe --abbrev=0`.. | \
- cut -c8- | \
- sed 's/ / /g' | \
- awk '{ print $$0 "," }' | \
- sort -u
+ cut -c8- | \
+ sed 's/ / /g' | \
+ awk '{ print $$0 "," }' | \
+ sort -u
diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
index 360ff92ebb..47a5e70ae5 100755
--- a/tools/meson-make-symlink.sh
+++ b/tools/meson-make-symlink.sh
@@ -5,7 +5,7 @@
mkdir -vp "$(dirname "${DESTDIR:-}$2")"
if [ "$(dirname $1)" = . ]; then
- ln -vfs -T "$1" "${DESTDIR:-}$2"
+ ln -vfs -T "$1" "${DESTDIR:-}$2"
else
- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
+ ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
fi
diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
index e2f5a355bc..dfd287e172 100755
--- a/units/meson-add-wants.sh
+++ b/units/meson-add-wants.sh
@@ -5,23 +5,23 @@ target="$2"
unit="$3"
case "$target" in
- */?*) # a path, but not just a slash at the end
- dir="${DESTDIR:-}${target}"
- ;;
- *)
- dir="${DESTDIR:-}${unitdir}/${target}"
- ;;
+ */?*) # a path, but not just a slash at the end
+ dir="${DESTDIR:-}${target}"
+ ;;
+ *)
+ dir="${DESTDIR:-}${unitdir}/${target}"
+ ;;
esac
unitpath="${DESTDIR:-}${unitdir}/${unit}"
case "$target" in
- */)
- mkdir -p -m 0755 "$dir"
- ;;
- *)
- mkdir -p -m 0755 "$(basename "$dir")"
- ;;
+ */)
+ mkdir -p -m 0755 "$dir"
+ ;;
+ *)
+ mkdir -p -m 0755 "$(basename "$dir")"
+ ;;
esac
ln -vfs --relative "$unitpath" "$dir"
View Lorry Controller Status