projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mention more versions of Windows. (Not Vista, yet.)
[u/mdw/putty]
/
unix
/
uxser.c
diff --git
a/unix/uxser.c
b/unix/uxser.c
index
08f2157
..
24b0124
100644
(file)
--- a/
unix/uxser.c
+++ b/
unix/uxser.c
@@
-214,7
+214,16
@@
static const char *serial_configure(Serial serial, Config *cfg)
#ifdef ONLCR
| ONLCR
#endif
#ifdef ONLCR
| ONLCR
#endif
- | OCRNL | ONOCR | ONLRET);
+#ifdef OCRNL
+ | OCRNL
+#endif
+#ifdef ONOCR
+ | ONOCR
+#endif
+#ifdef ONLRET
+ | ONLRET
+#endif
+ );
options.c_cc[VMIN] = 1;
options.c_cc[VTIME] = 0;
options.c_cc[VMIN] = 1;
options.c_cc[VTIME] = 0;
@@
-257,7
+266,7
@@
static const char *serial_init(void *frontend_handle, void **backend_handle,
if (serial->fd < 0)
return "Unable to open serial port";
if (serial->fd < 0)
return "Unable to open serial port";
-
fcntl(serial->fd, F_SETFD, FD_CLOEXEC
);
+
cloexec(serial->fd
);
err = serial_configure(serial, cfg);
if (err)
err = serial_configure(serial, cfg);
if (err)