Page MenuHomeFreeBSD
Files F110714479

D17267.id.diff
No OneTemporary
Actions

D17267.id.diff
View Options

Index: head/sbin/devd/devd.hh
===================================================================
--- head/sbin/devd/devd.hh
+++ head/sbin/devd/devd.hh
@@ -172,7 +172,7 @@
void sort_vector(std::vector<event_proc *> &);
void parse_one_file(const char *fn);
void parse_files_in_dir(const char *dirname);
- void expand_one(const char *&src, std::string &dst);
+ void expand_one(const char *&src, std::string &dst, bool is_shell);
std::string shell_quote(const std::string &s);
bool is_id_char(char) const;
bool chop_var(char *&buffer, char *&lhs, char *&rhs) const;
Index: head/sbin/devd/devd.cc
===================================================================
--- head/sbin/devd/devd.cc
+++ head/sbin/devd/devd.cc
@@ -666,7 +666,7 @@
}
void
-config::expand_one(const char *&src, string &dst)
+config::expand_one(const char *&src, string &dst, bool is_shell)
{
int count;
string buffer;
@@ -705,7 +705,7 @@
do {
buffer += *src++;
} while (is_id_char(*src));
- dst.append(shell_quote(get_variable(buffer)));
+ dst.append(is_shell ? shell_quote(get_variable(buffer)) : get_variable(buffer));
}
const string
@@ -731,7 +731,7 @@
}
dst.append(src, var_at - src);
src = var_at;
- expand_one(src, dst);
+ expand_one(src, dst, prepend == NULL);
}
if (append != NULL)

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 23, 5:57 AM (5 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16771930
Default Alt Text
D17267.id.diff (1 KB)

Event Timeline