Skip to content

fix: add macOS build support #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DonaldoDes wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: add macOS build support #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48f31d2
fix(macos): add build support for macOS (util.h + no -static)
DonaldoDes Mar 10, 2026
e0fe425
fix(master): scope buf and fd variables to non-TIOCSCTTY branch
DonaldoDes Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions atch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
#include <pty.h>
#endif

#ifdef HAVE_UTIL_H
#include <util.h>
#endif

#ifdef HAVE_LIBUTIL_H
#include <libutil.h>
#endif
Expand Down
4 changes: 4 additions & 0 deletions config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#define HAVE_LIBUTIL 1
#ifdef __APPLE__
#define HAVE_UTIL_H 1
#else
#define HAVE_PTY_H 1
#endif

#define HAVE_SYS_IOCTL_H 1
#define HAVE_SYS_RESOURCE_H 1
Expand Down
9 changes: 8 additions & 1 deletion makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ CFLAGS = -g -O2 -W -Wall -I. -DPACKAGE_VERSION=\"$(VERSION)\"
LDFLAGS =
LIBS = -lutil

UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)
STATIC_FLAG =
else
STATIC_FLAG = -static
endif

OBJ = attach.o master.o atch.o
SRC = attach.c master.c atch.c

Expand All @@ -14,7 +21,7 @@ archs = amd64 arm64
arch ?= $(shell arch)

atch: $(OBJ)
$(CC) -o $(BUILDDIR)/$@ -static $(LDFLAGS) $(OBJ) $(LIBS)
$(CC) -o $(BUILDDIR)/$@ $(STATIC_FLAG) $(LDFLAGS) $(OBJ) $(LIBS)

atch.1.md: README.md scripts/readme2man.sh
bash scripts/readme2man.sh $< > $@
Expand Down
12 changes: 5 additions & 7 deletions master.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,18 +853,16 @@ forkpty(int *amaster, char *name, struct termios *termp, struct winsize *winp)
if (pid < 0)
return -1;
else if (pid == 0) {
char *buf;
int fd;

setsid();
#ifdef TIOCSCTTY
buf = NULL;
if (ioctl(slave, TIOCSCTTY, NULL) < 0)
_exit(1);
#else
buf = ptsname(master);
fd = open(buf, O_RDWR);
close(fd);
{
char *buf = ptsname(master);
int fd = open(buf, O_RDWR);
close(fd);
}
#endif
dup2(slave, 0);
dup2(slave, 1);
Expand Down