Commit 5232856229f67c785b43ee8edfa86e40d394e488

Added handling for (suggest)
src/gaze.mod
(16 / 13)
  
143143PROCEDURE dependencies(parse : Message.Parse);
144144CONST
145145 recast = '/var/lib/sorcery/codex/test/gnome2-libs/glib2 is forcing a recast of pkgconfig';
146 noColors = "| sed 's/\x1b[^m]*m//g' "; (* strip colors *)
146 noColors = "| sed 's/\x1b[^m]*m//g' "; (* strip colors *)
147147 modDepends = "| sed s/\(depends\)//g "; (* modify (depends) *)
148148 modOptional = "| sed s/\ \(optional\)/*/g "; (* Modify (optional) *)
149 modSub = "| sed s/-sub//g "; (* Modify -sub *)
149 modSuggest = "| sed s/\ \(suggest\)/\$/g "; (* Modify (suggest) *)
150 modSub = "| sed 's/-sub//g' "; (* Modify -sub *)
150151 modSpaces = "| sed 's/^ *//;s/ *$//;s/ \{1,\}/ /g' "; (* delete extra spaces *)
151 FILTER = noColors+modDepends+modOptional+modSub+modSpaces;
152 FILTER = noColors+modDepends+modOptional+modSuggest+modSub+modSpaces;
152153
153154 writeFIFO = p6Fifo.writeFIFO;
154155 readFIFO = p6Fifo.readFIFO;
155
156 flags = StreamFile.read+StreamFile.old;
156157VAR
157 command, result : ARRAY[0..4095] OF CHAR; (* bufferSize from p6Fifo *)
158 target, null: ARRAY [0..99] OF CHAR;
159 a, pos : CARDINAL;
158 command, result, target, null : ARRAY[0..4095] OF CHAR; (* bufferSize from p6Fifo *)
159 (* target, null: ARRAY [0..499] OF CHAR; *)
160 a, pos, exit : CARDINAL;
160161 found, valid : BOOLEAN;
161
162 debugging : BOOLEAN;
163 file : StreamFile.ChanId;
164 res: StreamFile.OpenResults;
162165BEGIN
166 debugging := TRUE;
163167 (* Initialize some variables *)
164168 command := ""; target := ""; result := "";
165169 util.CmdUsed(parse);
176176 END;
177177 (* Delete leading spaces *)
178178 StringParse.TrimLeft(target);
179
179180 (* We only accept one word, look for a space, if there, remove it and anything that follows.*)
180181 Strings.FindNext(" ", target, 1, found, pos);
181182 IF found THEN Strings.Extract(target, 0, pos, target) END;
189189 END;
190190
191191 (* Everything looks good *)
192
193
194 FormStr.print(command, "echo $(gaze -q dependencies -c %s 2) %s", target, FILTER);
192 FormStr.print(command, 'echo $(gaze -q dependencies -c "%s" 2) %s ', target, FILTER);
195193 writeFIFO(command);
196 readFIFO(result);
197
194 readFIFO(result);
195
198196 (* Not sure how to handle this otherwise *)
199197 Strings.FindNext(recast, result, 0, found, pos);
200198 IF found THEN