Request env on channel. Refs blinksh#287

ssy0619 · Sep 12, 2018 · 596937c · 596937c
1 parent d044f4c
commit 596937c
Showing 1 changed file with 32 additions and 0 deletions.
diff --git a/Blink/SSHClient.m b/Blink/SSHClient.m
@@ -743,6 +743,9 @@ - (int)_start_session_channel {
     break;
   }
 
+
+  [self _ssh_send_env: channel];
+
   BOOL doRequestPTY = _options[SSHOptionRequestTTY] == SSHOptionValueYES
   || (_options[SSHOptionRequestTTY] == SSHOptionValueAUTO && _isTTY);
 
@@ -805,6 +808,35 @@ - (int)_start_session_channel {
   return rc;
 }
 
+- (void)_ssh_send_env:(ssh_channel) channel {
+  NSArray *vars = _options[SSHOptionSendEnv];
+  if (!vars.count) {
+    return;
+  }
+
+  for (NSString *varName in vars) {
+    [self _log_verbose:[NSString stringWithFormat:@"Sending env '%@'", varName]];
+
+    char *varValue = getenv(varName.UTF8String);
+    if (!varValue) {
+      continue;
+    }
+
+    for(;;) {
+      int rc = ssh_channel_request_env(channel, varName.UTF8String, varValue);
+      switch (rc) {
+        case SSH_AGAIN:
+          [self _poll];
+          continue;
+        case SSH_OK:
+        default:
+          break;
+      }
+      break;
+    }
+  }
+}
+
 - (int)_start_stdio_forwarding:(NSString *)hostPort {
   NSArray *hostAndPort = [hostPort componentsSeparatedByString:@":"];
   if (hostAndPort.count != 2) {