summaryrefslogtreecommitdiff
path: root/term
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@gnu.org>2002-03-26 19:11:01 +0000
committerNeal H. Walfield <neal@gnu.org>2002-03-26 19:11:01 +0000
commite581cc5d90e80f713c9636bcb4a47cf9bbb73c23 (patch)
tree618720b825236e05bf3f7d254a81a2f765743e5b /term
parent927bf1d75bca2da6dee691ec851a5d6cec40125c (diff)
2002-03-23 James A. Morrison <ja2morri@uwaterloo.ca>
* main.c: Include <error.h>. (main): Use error, not fprintf and exit or perror and exit. Use ERR, not errno. Use MACH_PORT_NULL explicitly. * users.c: Include <error.h>. (init_users): Use ERR, not errno. Use error, not perror and exit.
Diffstat (limited to 'term')
-rw-r--r--term/main.c58
-rw-r--r--term/users.c14
2 files changed, 30 insertions, 42 deletions
diff --git a/term/main.c b/term/main.c
index 769a8114..3bab786b 100644
--- a/term/main.c
+++ b/term/main.c
@@ -26,6 +26,7 @@
#include <argp.h>
#include <hurd/fsys.h>
#include <string.h>
+#include <error.h>
#include <version.h>
@@ -148,6 +149,7 @@ main (int argc, char **argv)
struct trivfs_control **ourcntl, **peercntl;
mach_port_t bootstrap, right;
struct stat st;
+ error_t err;
term_bucket = ports_create_bucket ();
@@ -206,27 +208,20 @@ main (int argc, char **argv)
default:
/* Should not happen. */
- fprintf (stderr, "Unknown terminal type\n");
- exit (1);
+ error (1, 0, "Unknown terminal type");
}
task_get_bootstrap_port (mach_task_self (), &bootstrap);
if (bootstrap == MACH_PORT_NULL)
- {
- fprintf (stderr, "Must be started as a translator\n");
- exit (1);
- }
+ error (1, 0, "Must be started as a translator");
/* Set our node. */
- errno = trivfs_startup (bootstrap, 0,
- ourcntlclass, term_bucket, ourclass, term_bucket,
- ourcntl);
- if (errno)
- {
- perror ("Starting translator");
- exit (1);
- }
+ err = trivfs_startup (bootstrap, 0,
+ ourcntlclass, term_bucket, ourclass, term_bucket,
+ ourcntl);
+ if (err)
+ error (1, err, "Starting translator");
/* For ptys, the nodename depends on which half is used. For now just use
the hook to store the nodename. */
@@ -238,25 +233,22 @@ main (int argc, char **argv)
char *peer_name = tty_arg;
file_t file = file_name_lookup (peer_name, O_CREAT|O_NOTRANS, 0666);
- if (file != MACH_PORT_NULL)
- errno = 0;
+ if (file == MACH_PORT_NULL)
+ err = errno;
- if (! errno)
- errno = trivfs_create_control (file, peercntlclass, term_bucket,
- peerclass, term_bucket, peercntl);
- if (! errno)
+ if (! err)
+ err = trivfs_create_control (file, peercntlclass, term_bucket,
+ peerclass, term_bucket, peercntl);
+ if (! err)
{
right = ports_get_send_right (*peercntl);
- errno = file_set_translator (file, 0, FS_TRANS_EXCL | FS_TRANS_SET,
+ err = file_set_translator (file, 0, FS_TRANS_EXCL | FS_TRANS_SET,
0, 0, 0, right, MACH_MSG_TYPE_COPY_SEND);
mach_port_deallocate (mach_task_self (), right);
}
- if (errno)
- {
- perror (peer_name);
- exit (1);
- }
+ if (err)
+ error (1, err, peer_name);
(*peercntl)->hook = peer_name;
ports_port_deref (*peercntl);
@@ -267,13 +259,12 @@ main (int argc, char **argv)
mutex_init (&global_lock);
/* Initialize status from underlying node. */
- errno = io_stat ((*ourcntl)->underlying, &st);
- if (errno)
+ err = io_stat ((*ourcntl)->underlying, &st);
+ if (err)
{
/* We cannot stat the underlying node. Fallback to the defaults. */
term_owner = term_group = 0;
term_mode = (bottom == &ptyio_bottom ? DEFFILEMODE : S_IRUSR | S_IWUSR);
- errno = 0;
}
else
{
@@ -289,12 +280,9 @@ main (int argc, char **argv)
outputq = create_queue (256, QUEUE_LOWAT, QUEUE_HIWAT);
- errno = (*bottom->init) ();
- if (errno)
- {
- perror ("Initializing bottom handler");
- exit (1);
- }
+ err = (*bottom->init) ();
+ if (err)
+ error (1, err, "Initializing bottom handler");
condition_init (&carrier_alert);
condition_init (&select_alert);
diff --git a/term/users.c b/term/users.c
index cc3f4acc..c0eb6f7c 100644
--- a/term/users.c
+++ b/term/users.c
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <hurd/iohelp.h>
#include <hurd/fshelp.h>
+#include <error.h>
#include "ourmsg_U.h"
@@ -84,13 +85,12 @@ struct protid_hook
void
init_users ()
{
- errno = ports_create_port (cttyid_class, term_bucket,
- sizeof (struct port_info), &cttyid);
- if (errno)
- {
- perror ("Allocating cttyid");
- exit (1);
- }
+ error_t err;
+
+ err = ports_create_port (cttyid_class, term_bucket,
+ sizeof (struct port_info), &cttyid);
+ if (err)
+ error (1, err, "Allocating cttyid");
mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE,
&async_icky_id);