blob: dfd48f820d9b937e54e20439f2cba7d487503045 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
#! @BASH@
# This script is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
# See the COPYING and AUTHORS files for more details.
# Read in library functions
if [ "$(type -t patch_file_name)" != function ]
then
if ! [ -r $QUILT_DIR/scripts/patchfns ]
then
echo "Cannot read library $QUILT_DIR/scripts/patchfns" >&2
exit 1
fi
. $QUILT_DIR/scripts/patchfns
fi
usage()
{
printf $"Usage: quilt add [-P patch] {file} ...\n"
if [ x$1 = x-h ]
then
printf $"
Add one or more files to the topmost or named patch. Files must be
added to the patch before being modified. Files that are modified by
patches already applied on top of the specified patch cannot be added.
-P patch
Patch to add files to.
"
exit 0
else
exit 1
fi
}
in_valid_dir()
{
local p=$1 path
path=${p%/*}
while [ "$p" != "$path" ]
do
if [ "$path" -ef "$QUILT_PATCHES" ]
then
printf $"File %s is located below %s\n" \
"$1" "$QUILT_PATCHES/"
return 1
fi
if [ "$path" -ef "$QUILT_PC" ]
then
printf $"File %s is located below %s\n" \
"$1" "$QUILT_PC/"
return 1
fi
p=$path
path=${path%/*}
done
}
options=`getopt -o P:h -- "$@"`
if [ $? -ne 0 ]
then
usage
fi
eval set -- "$options"
while true
do
case "$1" in
-P)
opt_patch="$2"
shift 2 ;;
-h)
usage -h ;;
--)
shift
break ;;
esac
done
if [ $# -lt 1 ]
then
usage
fi
patch=$(find_applied_patch "$opt_patch") || exit 1
status=0
for file in "$@"
do
if ! in_valid_dir "$SUBDIR$file"
then
status=1
continue
fi
if file_in_patch "$SUBDIR$file" $patch
then
printf $"File %s is already in patch %s\n" \
"$SUBDIR$file" "$(print_patch $patch)" >&2
[ $status -ne 1 ] && status=2
continue
fi
next_patch=$(next_patch_for_file $patch "$SUBDIR$file")
if [ -n "$next_patch" ]
then
printf $"File %s modified by patch %s\n" \
"$SUBDIR$file" "$(print_patch $next_patch)" >&2
status=1
continue
fi
if [ -L "$SUBDIR$file" ]
then
printf $"Cannot add symbolic link %s\n" "$SUBDIR$file" >&2
status=1
continue
fi
if ! $QUILT_LIB/backup-files -b -s -L -B $QUILT_PC/$patch/ "$SUBDIR$file"
then
printf $"Failed to back up file %s\n" "$SUBDIR$file" >&2
status=1
continue
fi
if [ -e "$SUBDIR$file" ]
then
# The original tree may be read-only.
chmod u+w "$SUBDIR$file"
fi
printf $"File %s added to patch %s\n" \
"$SUBDIR$file" "$(print_patch $patch)"
done
exit $status
### Local Variables:
### mode: shell-script
### End:
# vim:filetype=sh
|