1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

Add -quiet option to dtlogin.

This should shut up the console spamming, for those who use VT1.
Default behavior is not changed.
This commit is contained in:
Isaac Dunham 2013-09-21 20:30:52 -07:00 committed by Jon Trulson
parent e3973a9320
commit 380867c31c
4 changed files with 17 additions and 2 deletions

View file

@ -13,7 +13,7 @@
service </refpurpose></refnamediv> service </refpurpose></refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>dtlogin</command><arg choice="opt">&minus;config<replaceable>configuration_file</replaceable></arg><arg choice="opt">&minus;daemon</arg><arg choice="opt">&minus;debug<replaceable>debug_level</replaceable></arg><arg choice="opt">&minus;error<replaceable>error_log_file</replaceable></arg><arg choice="opt">&minus;nodaemon</arg><arg choice="opt">&minus;resources<replaceable>resource_file</replaceable></arg> <command>dtlogin</command><arg choice="opt">&minus;config<replaceable>configuration_file</replaceable></arg><arg choice="opt">&minus;daemon</arg><arg choice="opt">&minus;debug<replaceable>debug_level</replaceable></arg><arg choice="opt">&minus;error<replaceable>error_log_file</replaceable></arg><arg choice="opt">&minus;quiet</arg><arg choice="opt">&minus;nodaemon</arg><arg choice="opt">&minus;resources<replaceable>resource_file</replaceable></arg>
<arg choice="opt">&minus;server<replaceable>server_entry</replaceable></arg> <arg choice="opt">&minus;server<replaceable>server_entry</replaceable></arg>
<arg choice="opt">&minus;udpPort<replaceable>port_number</replaceable></arg> <arg choice="opt">&minus;udpPort<replaceable>port_number</replaceable></arg>
<arg choice="opt">&minus;session<replaceable>session_program</replaceable></arg> <arg choice="opt">&minus;session<replaceable>session_program</replaceable></arg>
@ -360,6 +360,14 @@ resource.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry><term>&minus;quiet</term>
<listitem>
<!-- ex-TP-->
<para>Specifies True as the value for the <literal>quiet</literal>
resource. This prevents dtlogin from writing status messages to tty1.
</para>
</listitem>
</varlistentry>
<varlistentry><term>&minus;resources resource_file</term> <varlistentry><term>&minus;resources resource_file</term>
<listitem> <listitem>
<!-- ex-TP--> <!-- ex-TP-->

View file

@ -1617,6 +1617,8 @@ GettyMessage( struct display *d, int msgnum )
FILE *tf; FILE *tf;
char buf[128]; char buf[128];
if (quiet) return;
strcpy(buf,"/dev/"); strcpy(buf,"/dev/");
strcat(buf,d->gettyLine); strcat(buf,d->gettyLine);

View file

@ -495,6 +495,7 @@ extern int debugLevel;
extern char *errorLogFile; extern char *errorLogFile;
extern int errorLogSize; extern int errorLogSize;
extern int daemonMode; extern int daemonMode;
extern int quiet;
extern char *pidFile; extern char *pidFile;
extern int lockPidFile; extern int lockPidFile;
extern char *authDir; extern char *authDir;

View file

@ -72,6 +72,7 @@ int debugLevel;
char *errorLogFile; char *errorLogFile;
int errorLogSize; int errorLogSize;
int daemonMode; int daemonMode;
int quiet;
char *pidFile; char *pidFile;
int lockPidFile; int lockPidFile;
char *authDir; char *authDir;
@ -254,6 +255,8 @@ struct dmResources {
"50", "50",
"daemonMode", "DaemonMode", DM_BOOL, (char **) &daemonMode, "daemonMode", "DaemonMode", DM_BOOL, (char **) &daemonMode,
"false", "false",
"quiet", "quiet", DM_BOOL, (char **) &quiet,
"false",
"pidFile", "PidFile", DM_STRING, &pidFile, "pidFile", "PidFile", DM_STRING, &pidFile,
"", "",
"lockPidFile", "LockPidFile", DM_BOOL, (char **) &lockPidFile, "lockPidFile", "LockPidFile", DM_BOOL, (char **) &lockPidFile,
@ -499,7 +502,8 @@ XrmOptionDescRec optionTable [] = {
{"-debug", "*debugLevel", XrmoptionSepArg, (caddr_t) NULL }, {"-debug", "*debugLevel", XrmoptionSepArg, (caddr_t) NULL },
{"-xrm", NULL, XrmoptionResArg, (caddr_t) NULL }, {"-xrm", NULL, XrmoptionResArg, (caddr_t) NULL },
{"-daemon", ".daemonMode", XrmoptionNoArg, "true" }, {"-daemon", ".daemonMode", XrmoptionNoArg, "true" },
{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" } {"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" },
{"-quiet", ".quiet", XrmoptionNoArg, "true" }
}; };
static int originalArgc; static int originalArgc;