From: Grant Erickson <gerickson@nuovations.com>
To: ell@lists.linux.dev
Cc: Marcel Holtmann <marcel@holtmann.org>
Subject: [RFC PATCH v8] ell/edit: Rename 'l_term_{open,close}'.
Date: Thu, 4 Apr 2024 17:36:56 -0700 [thread overview]
Message-ID: <20240405003658.3490494-8-gerickson@nuovations.com> (raw)
In-Reply-To: <20240405003658.3490494-1-gerickson@nuovations.com>
Renames 'l_term_{open,close}' to 'l_term_{acquire,release}' since this
aligns more closely with what is happening with the underlying file
descriptors. In particular, those descriptors are not being opened or
closed. Rather, their TTY parameters are being saved and altered on
'open' (now 'acquire') and restored on 'close' (now 'release'). At no
point are the descriptors being transformed with the 'open' or 'close'
system calls.
---
ell/ell.sym | 4 ++--
ell/term.c | 18 ++++++++++++------
ell/term.h | 4 ++--
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ell/ell.sym b/ell/ell.sym
index 2767bf55e079..0026bbe1afcf 100644
--- a/ell/ell.sym
+++ b/ell/ell.sym
@@ -632,8 +632,8 @@ global:
l_term_set_output;
l_term_set_output_stdout;
l_term_set_key_handler;
- l_term_open;
- l_term_close;
+ l_term_acquire;
+ l_term_release;
l_term_io_callback;
l_term_process;
l_term_putnstr;
diff --git a/ell/term.c b/ell/term.c
index 7ec92476e14e..f3801bcb1200 100644
--- a/ell/term.c
+++ b/ell/term.c
@@ -126,7 +126,7 @@ struct l_term {
unsigned short num_row;
unsigned short num_col;
struct l_signal *sigwinch;
- bool is_running;
+ bool is_acquired;
char key_buf[8];
size_t key_len;
l_term_key_func_t key_handler;
@@ -145,7 +145,7 @@ LIB_EXPORT struct l_term *l_term_new(void)
term->out_fd = -1;
term->out_ops = NULL;
- term->is_running = false;
+ term->is_acquired = false;
return term;
}
@@ -241,7 +241,7 @@ static void sigwinch_handler(void *user_data)
&term->num_row, &term->num_col);
}
-LIB_EXPORT int l_term_open(struct l_term *term)
+LIB_EXPORT int l_term_acquire(struct l_term *term)
{
struct termios termios;
int retval = 0;
@@ -249,6 +249,9 @@ LIB_EXPORT int l_term_open(struct l_term *term)
if (!term)
return -EINVAL;
+ if (term->is_acquired)
+ return -EALREADY;
+
/* Missing input or output file descriptor is a non-recoverable
* situation at this point.
*/
@@ -317,19 +320,20 @@ LIB_EXPORT int l_term_open(struct l_term *term)
IO_HANDLER(term, term->in_fd, 1, 0);
IO_HANDLER(term, term->out_fd, 0, 1);
- term->is_running = true;
+ term->is_acquired = true;
return retval;
}
-LIB_EXPORT int l_term_close(struct l_term *term)
+LIB_EXPORT int l_term_release(struct l_term *term)
{
int retval = 0;
if (!term)
return -EINVAL;
- term->is_running = false;
+ if (!term->is_acquired)
+ return -EALREADY;
IO_HANDLER(term, term->in_fd, 0, 0);
IO_HANDLER(term, term->out_fd, 0, 0);
@@ -347,6 +351,8 @@ LIB_EXPORT int l_term_close(struct l_term *term)
if (retval < 0)
return retval;
+ term->is_acquired = false;
+
return retval;
}
diff --git a/ell/term.h b/ell/term.h
index 89ed6c97c7ce..50831c166c78 100644
--- a/ell/term.h
+++ b/ell/term.h
@@ -44,8 +44,8 @@ typedef void (*l_term_key_func_t) (struct l_term *term, wint_t wch, void *user_d
int l_term_set_key_handler(struct l_term *term,
l_term_key_func_t handler, void *user_data);
-int l_term_open(struct l_term *term);
-int l_term_close(struct l_term *term);
+int l_term_acquire(struct l_term *term);
+int l_term_release(struct l_term *term);
bool l_term_io_callback(struct l_io *io, void *user_data);
--
2.42.0
next prev parent reply other threads:[~2024-04-05 0:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 0:36 [RFC PATCH v8] Input/Output Terminal Abstraction Grant Erickson
2024-04-05 0:36 ` [RFC PATCH v8] term: Initial revision Grant Erickson
2024-04-05 0:36 ` [RFC PATCH v8] ell: Add include directive for 'ell/term.h' Grant Erickson
2024-04-05 0:36 ` [RFC PATCH v8] ell/Makefile: Added 'term.[ch]' to HEADERS and SOURCES Grant Erickson
2024-04-05 0:36 ` [RFC PATCH v8] term: Added 'l_term_*' symbols Grant Erickson
2024-05-16 8:16 ` Martin Hundebøll
2024-05-16 15:35 ` Grant Erickson
2024-04-05 0:36 ` [RFC PATCH v8] ell/term: Do not return -EPERM for 'putnstr' and 'vprint' if not running Grant Erickson
2024-04-05 0:36 ` [RFC PATCH v8] ell/term: Return error on writes if the output descriptor is invalid Grant Erickson
2024-04-05 0:36 ` Grant Erickson [this message]
2024-04-05 0:36 ` [RFC PATCH v8] ell/term: Add an 'l_term_is_acquired' introspection function Grant Erickson
2024-04-05 0:36 ` [RFC PATCH v8] ell/term: Added ASCII C0 and C1 control code mnemonics Grant Erickson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240405003658.3490494-8-gerickson@nuovations.com \
--to=gerickson@nuovations.com \
--cc=ell@lists.linux.dev \
--cc=marcel@holtmann.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).