diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-06-18 23:57:51 +0200 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-06-18 23:57:51 +0200 |
| commit | 7cda34cf34f3afbd3f2000aa5e2b59ddc319f0f2 (patch) | |
| tree | ff18b856a35c80a9cc40573c76899d8a468bedc5 /src/cmd/mk | |
| parent | ea23656f7c3afcfd8516b00c0db09879ae80a09f (diff) | |
| parent | 329831171dd6ef81c113f101093c7b4947381003 (diff) | |
| download | plan9port-7cda34cf34f3afbd3f2000aa5e2b59ddc319f0f2.tar.gz plan9port-7cda34cf34f3afbd3f2000aa5e2b59ddc319f0f2.tar.bz2 plan9port-7cda34cf34f3afbd3f2000aa5e2b59ddc319f0f2.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/mk')
| -rw-r--r-- | src/cmd/mk/archive.c | 4 | ||||
| -rw-r--r-- | src/cmd/mk/env.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/cmd/mk/archive.c b/src/cmd/mk/archive.c index 5b0c1d00..6d646979 100644 --- a/src/cmd/mk/archive.c +++ b/src/cmd/mk/archive.c @@ -1,5 +1,9 @@ #include "mk.h" +#if defined(__AIX__) +#define ARMAG "<bigaf>\n" +#else #define ARMAG "!<arch>\n" +#endif #define SARMAG (sizeof(ARMAG) - sizeof("")) #define ARFMAG "`\n" diff --git a/src/cmd/mk/env.c b/src/cmd/mk/env.c index d7c6481d..e01aa21a 100644 --- a/src/cmd/mk/env.c +++ b/src/cmd/mk/env.c @@ -123,7 +123,8 @@ buildenv(Job *j, int slot) qp = strchr(cp+1, ')'); if(qp){ *qp = 0; - strcpy(w->s, cp+1); + /* strcpy, but might overlap */ + memmove(w->s, cp+1, strlen(cp+1)+1); l = &w->next; w = w->next; continue; |