* [Patch] can-utils/slcanpty.c pseudo-terminal interface
@ 2012-09-16 22:12 uescher
2012-09-17 7:40 ` Marc Kleine-Budde
0 siblings, 1 reply; 7+ messages in thread
From: uescher @ 2012-09-16 22:12 UTC (permalink / raw)
To: linux-can
[-- Attachment #1: Type: text/plain, Size: 125 bytes --]
Add Support for the Unix 98 pseudo-terminal interface /dev/ptmx /dev/pts/N
please take a look over the little Patch.
Thanks
[-- Attachment #2: patch.diff --]
[-- Type: text/x-patch, Size: 1643 bytes --]
diff --git a/slcanpty.c b/slcanpty.c
index 67dcf35..e3b7304 100644
--- a/slcanpty.c
+++ b/slcanpty.c
@@ -26,6 +26,11 @@
*
*/
+#ifndef _GNU_SOURCE
+// To get ptsname grantpt and unlockpt definitions from stdlib.h
+#define _GNU_SOURCE
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -45,6 +50,8 @@
/* maximum rx buffer len: extended CAN frame with timestamp */
#define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1)
+#define DEVICE_NAME_PTMX "/dev/ptmx"
+
#define DEBUG
static int asc2nibble(char c)
@@ -387,6 +394,8 @@ int main(int argc, char **argv)
fprintf(stderr, "Usage: %s <pty> <can interface>\n", argv[0]);
fprintf(stderr, "e.g. '%s /dev/ptyc0 can0' creates"
" /dev/ttyc0 for the slcan application\n", argv[0]);
+ fprintf(stderr, "e.g. for pseudo-terminal '%s /dev/ptmx can0' creates"
+ " /dev/pts/N\n", argv[0]);
fprintf(stderr, "\n");
return 1;
}
@@ -408,6 +417,27 @@ int main(int argc, char **argv)
ECHONL | ECHOPRT | ECHOKE | ICRNL);
tcsetattr(p, TCSANOW, &topts);
+ //Support for the Unix 98 pseudo-terminal interface /dev/ptmx /dev/pts/N
+ if (strcmp(argv[1],DEVICE_NAME_PTMX) == 0) {
+ if (grantpt(p) < 0) {
+ perror("grantpt");
+ return 1;
+ }
+
+ if (unlockpt(p) < 0) {
+ perror("unlockpt");
+ return 1;
+ }
+
+ char* name_pts = NULL; /* slave pseudo-terminal device name */
+ name_pts = ptsname(p);
+ if (name_pts == NULL) {
+ perror("ptsname");
+ return 1;
+ }
+ printf("open: %s: slave pseudo-terminal is %s\n", argv[1], name_pts);
+ }
+
/* open socket */
s = socket(PF_CAN, SOCK_RAW, CAN_RAW);
if (s < 0) {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Patch] can-utils/slcanpty.c pseudo-terminal interface
2012-09-16 22:12 [Patch] can-utils/slcanpty.c pseudo-terminal interface uescher
@ 2012-09-17 7:40 ` Marc Kleine-Budde
2012-09-21 8:28 ` uescher
2012-12-15 1:14 ` uescher
0 siblings, 2 replies; 7+ messages in thread
From: Marc Kleine-Budde @ 2012-09-17 7:40 UTC (permalink / raw)
To: uescher; +Cc: linux-can
[-- Attachment #1: Type: text/plain, Size: 3061 bytes --]
Hello,
On 09/17/2012 12:12 AM, uescher wrote:
> Add Support for the Unix 98 pseudo-terminal interface /dev/ptmx /dev/pts/N
Cool, what kind of cool things can we do if this tool supports ptys?
>
> please take a look over the little Patch.
> Thanks
Can you add a Signed-off-by[1] to your patch?
[1]
http://lxr.free-electrons.com/source/Documentation/SubmittingPatches#L298
Please don't use C++ comments, use Standard C comments. /* comment */.
Please remove any trailing whitespace from your patch.
Some nitpicking inline:
>
> patch.diff
>
>
> diff --git a/slcanpty.c b/slcanpty.c
> index 67dcf35..e3b7304 100644
> --- a/slcanpty.c
> +++ b/slcanpty.c
> @@ -26,6 +26,11 @@
> *
> */
>
I think it's okay to just define _GNU_SOURCE.
> +#ifndef _GNU_SOURCE
> +// To get ptsname grantpt and unlockpt definitions from stdlib.h
> +#define _GNU_SOURCE
> +#endif
> +
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> @@ -45,6 +50,8 @@
> /* maximum rx buffer len: extended CAN frame with timestamp */
> #define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1)
>
> +#define DEVICE_NAME_PTMX "/dev/ptmx"
> +
> #define DEBUG
>
> static int asc2nibble(char c)
> @@ -387,6 +394,8 @@ int main(int argc, char **argv)
> fprintf(stderr, "Usage: %s <pty> <can interface>\n", argv[0]);
> fprintf(stderr, "e.g. '%s /dev/ptyc0 can0' creates"
> " /dev/ttyc0 for the slcan application\n", argv[0]);
> + fprintf(stderr, "e.g. for pseudo-terminal '%s /dev/ptmx can0' creates"
^^^^^^^^^
Please use %s....
> + " /dev/pts/N\n", argv[0]);
^^^
...and add ", DEVICE_NAME_PTMX" here.
> fprintf(stderr, "\n");
> return 1;
> }
> @@ -408,6 +417,27 @@ int main(int argc, char **argv)
> ECHONL | ECHOPRT | ECHOKE | ICRNL);
> tcsetattr(p, TCSANOW, &topts);
>
> + //Support for the Unix 98 pseudo-terminal interface /dev/ptmx /dev/pts/N
> + if (strcmp(argv[1],DEVICE_NAME_PTMX) == 0) {
^^^
Please add a space after the comma.
> + if (grantpt(p) < 0) {
> + perror("grantpt");
> + return 1;
> + }
> +
> + if (unlockpt(p) < 0) {
> + perror("unlockpt");
> + return 1;
> + }
> +
> + char* name_pts = NULL; /* slave pseudo-terminal device name */
^^^
Please make it "char *name_pts".
> + name_pts = ptsname(p);
> + if (name_pts == NULL) {
> + perror("ptsname");
> + return 1;
> + }
> + printf("open: %s: slave pseudo-terminal is %s\n", argv[1], name_pts);
> + }
> +
> /* open socket */
> s = socket(PF_CAN, SOCK_RAW, CAN_RAW);
> if (s < 0) {
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Patch] can-utils/slcanpty.c pseudo-terminal interface
2012-09-17 7:40 ` Marc Kleine-Budde
@ 2012-09-21 8:28 ` uescher
2012-12-15 1:14 ` uescher
1 sibling, 0 replies; 7+ messages in thread
From: uescher @ 2012-09-21 8:28 UTC (permalink / raw)
To: linux-can
Thank you Marc for your feedback.
I have no time for the next two weeks.
I will report again in two weeks.
Ulrich
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Patch] can-utils/slcanpty.c pseudo-terminal interface
2012-09-17 7:40 ` Marc Kleine-Budde
2012-09-21 8:28 ` uescher
@ 2012-12-15 1:14 ` uescher
2012-12-16 16:02 ` Oliver Hartkopp
1 sibling, 1 reply; 7+ messages in thread
From: uescher @ 2012-12-15 1:14 UTC (permalink / raw)
To: linux-can
Next try :)
Add Support for the Unix 98 pseudo-terminal interface /dev/ptmx /dev/pts/N
http://www.kernel.org/doc/man-pages/online/pages/man4/pts.4.html
My change is like this change:
http://sourceforge.net/tracker/index.php?func=detail&aid=3467521&group_id=146269&atid=764681
most Linux distributions do not configure their kernels to use the BSD
pseudo-terminal interface (/dev/pty* and /dev/tty*) anymore; they uses
the Unix 98 pseudo-terminal interface instead (/dev/ptmx and /dev/pts/*).
Maybe is it possible to add this patch for the next release.
Thanks.
Signed-off-by: Ulrich Escher<git@myvdr.de>
---
slcanpty.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/slcanpty.c b/slcanpty.c
index 67a7491..13ed96c 100644
--- a/slcanpty.c
+++ b/slcanpty.c
@@ -22,6 +22,9 @@
*
*/
+/* To get ptsname grantpt and unlockpt definitions from stdlib.h */
+#define _GNU_SOURCE
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -40,6 +43,7 @@
/* maximum rx buffer len: extended CAN frame with timestamp */
#define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1)
+#define DEVICE_NAME_PTMX "/dev/ptmx"
#define DEBUG
@@ -383,6 +387,8 @@ int main(int argc, char **argv)
fprintf(stderr, "Usage: %s <pty> <can interface>\n", argv[0]);
fprintf(stderr, "e.g. '%s /dev/ptyc0 can0' creates"
" /dev/ttyc0 for the slcan application\n", argv[0]);
+ fprintf(stderr, "e.g. for pseudo-terminal '%s %s can0' creates"
+ " /dev/pts/N\n", argv[0], DEVICE_NAME_PTMX);
fprintf(stderr, "\n");
return 1;
}
@@ -404,6 +410,27 @@ int main(int argc, char **argv)
ECHONL | ECHOPRT | ECHOKE | ICRNL);
tcsetattr(p, TCSANOW, &topts);
+ /* Support for the Unix 98 pseudo-terminal interface /dev/ptmx
/dev/pts/N */
+ if (strcmp(argv[1], DEVICE_NAME_PTMX) == 0) {
+ if (grantpt(p) < 0) {
+ perror("grantpt");
+ return 1;
+ }
+
+ if (unlockpt(p) < 0) {
+ perror("unlockpt");
+ return 1;
+ }
+
+ char *name_pts = NULL; /* slave pseudo-terminal device name */
+ name_pts = ptsname(p);
+ if (name_pts == NULL) {
+ perror("ptsname");
+ return 1;
+ }
+ printf("open: %s: slave pseudo-terminal is %s\n", argv[1],
name_pts);
+ }
+
/* open socket */
s = socket(PF_CAN, SOCK_RAW, CAN_RAW);
if (s < 0) {
--
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Patch] can-utils/slcanpty.c pseudo-terminal interface
2012-12-15 1:14 ` uescher
@ 2012-12-16 16:02 ` Oliver Hartkopp
2012-12-17 18:09 ` uescher
0 siblings, 1 reply; 7+ messages in thread
From: Oliver Hartkopp @ 2012-12-16 16:02 UTC (permalink / raw)
To: uescher, Marc Kleine-Budde; +Cc: linux-can
Please re-send with proper whitespaces.
Something (your mail client?) replaced tabs with spaces ...
@Marc: If there're new no remarks from your side you can add my
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
for the re-posted patch.
Tnx Ulrich for the pts support!
Regards,
Oliver
On 15.12.2012 02:14, uescher wrote:
> Next try :)
> Add Support for the Unix 98 pseudo-terminal interface /dev/ptmx /dev/pts/N
> http://www.kernel.org/doc/man-pages/online/pages/man4/pts.4.html
> My change is like this change:
> http://sourceforge.net/tracker/index.php?func=detail&aid=3467521&group_id=146269&atid=764681
>
> most Linux distributions do not configure their kernels to use the BSD
> pseudo-terminal interface (/dev/pty* and /dev/tty*) anymore; they uses the
> Unix 98 pseudo-terminal interface instead (/dev/ptmx and /dev/pts/*).
> Maybe is it possible to add this patch for the next release.
> Thanks.
>
> Signed-off-by: Ulrich Escher<git@myvdr.de>
> ---
> slcanpty.c | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/slcanpty.c b/slcanpty.c
> index 67a7491..13ed96c 100644
> --- a/slcanpty.c
> +++ b/slcanpty.c
> @@ -22,6 +22,9 @@
> *
> */
>
> +/* To get ptsname grantpt and unlockpt definitions from stdlib.h */
> +#define _GNU_SOURCE
> +
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> @@ -40,6 +43,7 @@
>
> /* maximum rx buffer len: extended CAN frame with timestamp */
> #define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1)
> +#define DEVICE_NAME_PTMX "/dev/ptmx"
>
> #define DEBUG
>
> @@ -383,6 +387,8 @@ int main(int argc, char **argv)
> fprintf(stderr, "Usage: %s <pty> <can interface>\n", argv[0]);
> fprintf(stderr, "e.g. '%s /dev/ptyc0 can0' creates"
> " /dev/ttyc0 for the slcan application\n", argv[0]);
> + fprintf(stderr, "e.g. for pseudo-terminal '%s %s can0' creates"
> + " /dev/pts/N\n", argv[0], DEVICE_NAME_PTMX);
> fprintf(stderr, "\n");
> return 1;
> }
> @@ -404,6 +410,27 @@ int main(int argc, char **argv)
> ECHONL | ECHOPRT | ECHOKE | ICRNL);
> tcsetattr(p, TCSANOW, &topts);
>
> + /* Support for the Unix 98 pseudo-terminal interface /dev/ptmx /dev/pts/N */
> + if (strcmp(argv[1], DEVICE_NAME_PTMX) == 0) {
> + if (grantpt(p) < 0) {
> + perror("grantpt");
> + return 1;
> + }
> +
> + if (unlockpt(p) < 0) {
> + perror("unlockpt");
> + return 1;
> + }
> +
> + char *name_pts = NULL; /* slave pseudo-terminal device name */
> + name_pts = ptsname(p);
> + if (name_pts == NULL) {
> + perror("ptsname");
> + return 1;
> + }
> + printf("open: %s: slave pseudo-terminal is %s\n", argv[1], name_pts);
> + }
> +
> /* open socket */
> s = socket(PF_CAN, SOCK_RAW, CAN_RAW);
> if (s < 0) {
> --
> --
> To unsubscribe from this list: send the line "unsubscribe linux-can" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Patch] can-utils/slcanpty.c pseudo-terminal interface
2012-12-16 16:02 ` Oliver Hartkopp
@ 2012-12-17 18:09 ` uescher
2012-12-20 10:43 ` Oliver Hartkopp
0 siblings, 1 reply; 7+ messages in thread
From: uescher @ 2012-12-17 18:09 UTC (permalink / raw)
To: linux-can
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
Ok, thunderbird html ... is not so good :)
now in an extra complete File.
LG
Am 16.12.2012 17:02, schrieb Oliver Hartkopp:
> Please re-send with proper whitespaces.
>
> Something (your mail client?) replaced tabs with spaces ...
>
> @Marc: If there're new no remarks from your side you can add my
>
> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
>
> for the re-posted patch.
>
> Tnx Ulrich for the pts support!
[-- Attachment #2: 0001-Support-for-the-Unix-98-pseudo-terminal-interface-de.patch --]
[-- Type: text/x-patch, Size: 2513 bytes --]
From a6604f8e6a7ec558579ff523603a9a7892af54fd Mon Sep 17 00:00:00 2001
From: ulrich <git@myvdr.de>
Date: Sat, 15 Dec 2012 12:31:11 +0100
Subject: [PATCH] Support for the Unix 98 pseudo-terminal interface /dev/ptmx
/dev/pts/N
Add Support for the Unix 98 pseudo-terminal interface /dev/ptmx /dev/pts/N
http://www.kernel.org/doc/man-pages/online/pages/man4/pts.4.html
My change is like this change:
http://sourceforge.net/tracker/index.php?func=detail&aid=3467521&group_id=146269&atid=764681
most Linux distributions do not configure their kernels to use the BSD
pseudo-terminal interface (/dev/pty* and /dev/tty*) anymore; they uses the
Unix 98 pseudo-terminal interface instead (/dev/ptmx and /dev/pts/*).
Maybe is it possible to add this patch for the next release.
Thanks.
Signed-off-by: Ulrich Escher<git@myvdr.de>
---
slcanpty.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/slcanpty.c b/slcanpty.c
index 67a7491..13ed96c 100644
--- a/slcanpty.c
+++ b/slcanpty.c
@@ -22,6 +22,9 @@
*
*/
+/* To get ptsname grantpt and unlockpt definitions from stdlib.h */
+#define _GNU_SOURCE
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -40,6 +43,7 @@
/* maximum rx buffer len: extended CAN frame with timestamp */
#define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1)
+#define DEVICE_NAME_PTMX "/dev/ptmx"
#define DEBUG
@@ -383,6 +387,8 @@ int main(int argc, char **argv)
fprintf(stderr, "Usage: %s <pty> <can interface>\n", argv[0]);
fprintf(stderr, "e.g. '%s /dev/ptyc0 can0' creates"
" /dev/ttyc0 for the slcan application\n", argv[0]);
+ fprintf(stderr, "e.g. for pseudo-terminal '%s %s can0' creates"
+ " /dev/pts/N\n", argv[0], DEVICE_NAME_PTMX);
fprintf(stderr, "\n");
return 1;
}
@@ -404,6 +410,27 @@ int main(int argc, char **argv)
ECHONL | ECHOPRT | ECHOKE | ICRNL);
tcsetattr(p, TCSANOW, &topts);
+ /* Support for the Unix 98 pseudo-terminal interface /dev/ptmx /dev/pts/N */
+ if (strcmp(argv[1], DEVICE_NAME_PTMX) == 0) {
+ if (grantpt(p) < 0) {
+ perror("grantpt");
+ return 1;
+ }
+
+ if (unlockpt(p) < 0) {
+ perror("unlockpt");
+ return 1;
+ }
+
+ char *name_pts = NULL; /* slave pseudo-terminal device name */
+ name_pts = ptsname(p);
+ if (name_pts == NULL) {
+ perror("ptsname");
+ return 1;
+ }
+ printf("open: %s: slave pseudo-terminal is %s\n", argv[1], name_pts);
+ }
+
/* open socket */
s = socket(PF_CAN, SOCK_RAW, CAN_RAW);
if (s < 0) {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Patch] can-utils/slcanpty.c pseudo-terminal interface
2012-12-17 18:09 ` uescher
@ 2012-12-20 10:43 ` Oliver Hartkopp
0 siblings, 0 replies; 7+ messages in thread
From: Oliver Hartkopp @ 2012-12-20 10:43 UTC (permalink / raw)
To: uescher; +Cc: linux-can, Marc Kleine-Budde
Hello Ulrich,
applied to the can-utils git repo.
I moved the name_pts definition at the {} section start and reordered the
commit message information.
Tnx,
Oliver
On 17.12.2012 19:09, uescher wrote:
> Ok, thunderbird html ... is not so good :)
>
> now in an extra complete File.
>
> LG
>
> Am 16.12.2012 17:02, schrieb Oliver Hartkopp:
>> Please re-send with proper whitespaces.
>>
>> Something (your mail client?) replaced tabs with spaces ...
>>
>> @Marc: If there're new no remarks from your side you can add my
>>
>> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
>>
>> for the re-posted patch.
>>
>> Tnx Ulrich for the pts support!
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-12-20 10:43 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-16 22:12 [Patch] can-utils/slcanpty.c pseudo-terminal interface uescher
2012-09-17 7:40 ` Marc Kleine-Budde
2012-09-21 8:28 ` uescher
2012-12-15 1:14 ` uescher
2012-12-16 16:02 ` Oliver Hartkopp
2012-12-17 18:09 ` uescher
2012-12-20 10:43 ` Oliver Hartkopp
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 NNTP newsgroup(s).