[maintainer] Update maintainer e-mail address

[ultima]

Summary

• Updated maintainer email address

PR\: 220395
Sumitted by\: kevans
Reviewed by\: lifanov (mentor), matthew (mentor)
Approved by\: lifanov (mentor), matthew (mentor)
Differential Revision\: https://reviews.freebsd.org/DXXXXX

[lifanov]

Approved!

head/comms/direwolf/Makefile

for (; cs < ce; cs++) {
                 buffer += c;
         }
         buffer += '\'';
 
         return buffer;
 }
 
 void
-config::expand_one(const char *&src, string &dst)
+config::expand_one(const char *&src, string &dst, bool is_shell)
 {
         int count;
         string buffer;
 
         src++;
         // $$ -> $
         if (*src == '$') {
                 dst += *src++;
if (!isalpha(*src) && *src != '_' && *src != '-' && *src != '*') {
                 dst += *src++;
                 return;
         }
 
         // $var -> replace with value
         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
 config::expand_string(const char *src, const char *prepend, const char *append)
 {
         const char *var_at;
         string dst;
 
config::expand_string(const char *src, const char *prepend, const char *append)
         for (;;) {
                 var_at = strchr(src, '$');
                 if (var_at == NULL) {
                         dst.append(src);
                         break;
                 }
                 dst.append(src, var_at - src);
                 src = var_at;
-                expand_one(src, dst);
+                expand_one(src, dst, prepend == NULL);
         }
 
         if (append != NULL)
                 dst.append(append);
 
         return (dst);
 }
 

head/comms/java-simple-serial-connector/Makefile

for (; cs < ce; cs++) {
                 buffer += c;
         }
         buffer += '\'';
 
         return buffer;
 }
 
 void
-config::expand_one(const char *&src, string &dst)
+config::expand_one(const char *&src, string &dst, bool is_shell)
 {
         int count;
         string buffer;
 
         src++;
         // $$ -> $
         if (*src == '$') {
                 dst += *src++;
if (!isalpha(*src) && *src != '_' && *src != '-' && *src != '*') {
                 dst += *src++;
                 return;
         }
 
         // $var -> replace with value
         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
 config::expand_string(const char *src, const char *prepend, const char *append)
 {
         const char *var_at;
         string dst;
 
config::expand_string(const char *src, const char *prepend, const char *append)
         for (;;) {
                 var_at = strchr(src, '$');
                 if (var_at == NULL) {
                         dst.append(src);
                         break;
                 }
                 dst.append(src, var_at - src);
                 src = var_at;
-                expand_one(src, dst);
+                expand_one(src, dst, prepend == NULL);
         }
 
         if (append != NULL)
                 dst.append(append);
 
         return (dst);
 }
 

head/comms/multimon-ng/Makefile

for (; cs < ce; cs++) {
                 buffer += c;
         }
         buffer += '\'';
 
         return buffer;
 }
 
 void
-config::expand_one(const char *&src, string &dst)
+config::expand_one(const char *&src, string &dst, bool is_shell)
 {
         int count;
         string buffer;
 
         src++;
         // $$ -> $
         if (*src == '$') {
                 dst += *src++;
if (!isalpha(*src) && *src != '_' && *src != '-' && *src != '*') {
                 dst += *src++;
                 return;
         }
 
         // $var -> replace with value
         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
 config::expand_string(const char *src, const char *prepend, const char *append)
 {
         const char *var_at;
         string dst;
 
config::expand_string(const char *src, const char *prepend, const char *append)
         for (;;) {
                 var_at = strchr(src, '$');
                 if (var_at == NULL) {
                         dst.append(src);
                         break;
                 }
                 dst.append(src, var_at - src);
                 src = var_at;
-                expand_one(src, dst);
+                expand_one(src, dst, prepend == NULL);
         }
 
         if (append != NULL)
                 dst.append(append);
 
         return (dst);
 }
 

head/devel/arduino-avrdude/Makefile

for (; cs < ce; cs++) {
                 buffer += c;
         }
         buffer += '\'';
 
         return buffer;
 }
 
 void
-config::expand_one(const char *&src, string &dst)
+config::expand_one(const char *&src, string &dst, bool is_shell)
 {
         int count;
         string buffer;
 
         src++;
         // $$ -> $
         if (*src == '$') {
                 dst += *src++;
if (!isalpha(*src) && *src != '_' && *src != '-' && *src != '*') {
                 dst += *src++;
                 return;
         }
 
         // $var -> replace with value
         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
 config::expand_string(const char *src, const char *prepend, const char *append)
 {
         const char *var_at;
         string dst;
 
config::expand_string(const char *src, const char *prepend, const char *append)
         for (;;) {
                 var_at = strchr(src, '$');
                 if (var_at == NULL) {
                         dst.append(src);
                         break;
                 }
                 dst.append(src, var_at - src);
                 src = var_at;
-                expand_one(src, dst);
+                expand_one(src, dst, prepend == NULL);
         }
 
         if (append != NULL)
                 dst.append(append);
 
         return (dst);
 }