service: address review feedback on tty: stanza

Author: Ollie-Gutierrez

src/service.c

@@ -990,7 +990,7 @@ static int service_start(svc_t *svc)
 		 * terminal on that device now that we're a session leader.
 		 * Must run after setsid() to acquire the controlling TTY.
 		 */
-		if (!svc_is_tty(svc) && svc->log.ctty[0])
+		if (!svc_is_tty(svc) && svc_has_ctty(svc))
 			svc_prepare_ctty(svc->log.ctty, svc->cmd, !!svc->log.enabled);
 
 		if (svc_is_runtask(svc))
@@ -2210,6 +2210,7 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 		parse_caps(svc, caps);
 	else
 		memset(svc->capabilities, 0, sizeof(svc->capabilities));
+
 	if (!svc_is_tty(svc) && ctty) {
 		char *dev = ctty;
 
@@ -2221,7 +2222,10 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 			strlcpy(svc->log.ctty, dev, sizeof(svc->log.ctty));
 		else
 			logit(LOG_WARNING, "%s: tty: %s not found, skipping ctty", svc_ident(svc, NULL, 0), ctty);
+	} else if (!svc_is_tty(svc)) {
+		memset(svc->log.ctty, 0, sizeof(svc->log.ctty));
 	}
+
 	if (file)
 		strlcpy(svc->file, file, sizeof(svc->file));
 	else

src/svc.h

@@ -292,6 +292,7 @@ static inline int svc_in_runlevel  (svc_t *svc, int runlevel) { return svc && IS
 static inline int svc_has_pidfile  (svc_t *svc) { return svc_is_daemon(svc) && svc->pidfile[0] != 0 && svc->pidfile[0] != '!'; }
 static inline int svc_has_pre      (svc_t *svc) { return svc->pre_script[0];  }
 static inline int svc_has_post     (svc_t *svc) { return svc->post_script[0]; }
+static inline int svc_has_ctty     (svc_t *svc) { return svc && svc->log.ctty[0]; }
 static inline int svc_has_ready    (svc_t *svc) { return svc->ready_script[0];}
 static inline int svc_has_cleanup  (svc_t *svc) { return svc->cleanup_script[0]; }