Skip to content

GCC fixes #20

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
jlevon wants to merge 2 commits into
base: master
Choose a base branch
from
Open

GCC fixes #20

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
4da9c04
Makefile fixes for passing PATH and CC
May 14, 2020
e958096
Fix strncpy() in usdt_dof_file_load()
May 14, 2020
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
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CC = gcc
CFLAGS = -O2 -Wall
CC := gcc
CFLAGS := -O2 -Wall

# MAC_BUILD - set this to "universal" to build a 2-way fat library
MAC_BUILD = universal
Expand All @@ -20,7 +20,7 @@ endif

ifeq ($(UNAME), SunOS)
RANLIB=/bin/true
PATH +=:/usr/perl5/5.10.0/bin:/usr/perl5/5.12/bin
PATH := $(PATH):/usr/perl5/5.10.0/bin:/usr/perl5/5.12/bin
CFLAGS += -fPIC
ifeq ($(ARCH), i86pc)
ARCH = $(shell isainfo -k)
Expand Down
3 changes: 2 additions & 1 deletion usdt_dof_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ usdt_dof_file_load(usdt_dof_file_t *file, const char *module)
#if __FreeBSD__ >= 11
dh.dofhp_pid = getpid();
#endif
(void) strncpy(dh.dofhp_mod, module, sizeof (dh.dofhp_mod));
(void) strncpy(dh.dofhp_mod, module, sizeof (dh.dofhp_mod) - 1);
dh.dofhp_mod[sizeof (dh.dofhp_mod) - 1] = '\0';

if ((fd = open(helper, O_RDWR)) < 0)
return (-1);
Expand Down