Commit Graph

1206 Commits

Author SHA1 Message Date
Dan Cross
32d1c70622 Mostly trivial whitespace cleanups.
Clang-format and removing whitespace at the ends of lines.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-17 13:11:38 +10:00
Dan Cross
359a190ee9 Remove the last of the sprintf() calls.
sprintf() is unsafe since it may overflow the bounds
of its destination buffers.  Remove the last of the
calls to it; all the logic has either been rewritten
to use snprintf() or other forms of string copying
such as strlcpy().

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-17 13:11:33 +10:00
Dan Cross
aacb1000c8 Arrays to vectors.
This is the big push to get rid of the last of the
unadorned dynamic arrays.  Use ptr_vectors for things
like mail conferences etc.

Lots of incidental cleanup along the way.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-17 13:11:25 +10:00
Andrew Pamment
d8dc2e8f7d forgot to commit this file in last commit 2018-10-16 13:50:37 +10:00
Andrew Pamment
c3e21a5228 Add support for MUSL on Linux 2018-10-16 13:48:47 +10:00
Andrew Pamment
8f8a8d1b67 fix for compiling lua on dragonflybsd 2018-10-16 12:17:08 +10:00
Dan Cross
db53878cb1 Replace realloc() et al in unmangle_ansi with stralloc.
I think this is correct. The code, both before and
after, doesn't appear to NUL-terminate its output.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-16 11:01:14 +10:00
Dan Cross
58481b88eb Cleanup users.c.
This started with using bounded operations on strings,
and morphed to introducing a utility function to open
the USERS SQLite3 database and then a general cleanup.

This needs testing.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-16 11:01:11 +10:00
Dan Cross
f1361379af Replace calls to sprintf() with strlcpy() in settings.c.
sprintf() was being used to copy a string constant with
no formatting verbs; just use strlcpy() instead.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-16 11:00:16 +10:00
Dan Cross
588242f68e Squash use of strncat(). Replaced by strlcat().
Note that the calls to strncat() did not account for the
NUL terminating byte, and for very long queries could have
led to a buffer overrun.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-16 11:00:12 +10:00
Dan Cross
9f4269c74e Clean up menus.c.
In the course of removing calls to realloc(), change
the menu parsing and use logic to use ptr_vector's
directly.

This also fixes some detects menu issues in parsing
and avoids e.g. writing to a bad pointer (or should;
of course it needs testing...).

Finally, free menu state on return from the menu_system
function. There was a comment here to do that, but it
didn't appear to be done.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-16 11:00:08 +10:00
Dan Cross
69c7286ea7 util.c: munmap takes a pointer, not a file descriptor.
The first argument to munmap(2) should be a pointer to
an mmap'ed region, not a file descriptor.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-16 11:00:01 +10:00
Dan Cross
3519368d37 bbs.h: Add prototype for broadcast.
This squelches a warning in menus.c.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-16 10:59:57 +10:00
Dan Cross
931c5625a3 Get rid of strncpy() calls.
The poorly named `strncpy` was originally written to
copy data into fixed-sized, disk-resident data structures
in an early version of the research Unix kernel.  Thus, it
has peculiar semantics: it takes source and destination
pointer arguments and a length and will *always* modify
exactly `length` bytes in the destination buffer.  If
the length of the source (which is presumed to be a
NUL-terminated C-stylestring) is `length` or more chars
long, then the result will not be NUL terminated.  If it
is less than `length` bytes long, then the result will be
padded with zeros up to `length`.

This is all well and good for storing a file name into a
fixed-width directory entry in 6th edition Unix, but it's
not useful as a general-purpose string utility.

Replaced with calls to strlcpy(), which always properly
terminates the destination but doesn't have the additional
zeroing behavior.  Since the buffers that we're copying
into were allocated with malloz(), and thus are guaranteed
to be filled with zeros, we're not leaking data, but not
double-zeroing either.

A few other things were changed. Lengths of destination
buffers are now given via `sizeof` instead of manifest
constants.  One call to `memcpy` took the length from the
size of the source argument, thus possibly writing beyond
the end of the destination buffer.  Changed to a call to
strlcpy() with length the sizeof destination.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-16 10:59:53 +10:00
Andrew Pamment
f01cd5f1a6 Change file_id.diz to test post-receive hook 2018-10-15 14:51:37 +10:00
Andrew Pamment
7dddbde063 Fix www messages sending 2018-10-15 10:46:49 +10:00
Andrew Pamment
9d728d9a29 couple of minor fixes 2018-10-15 10:31:28 +10:00
Dan Cross
9bfc4ffbe5 More string cleanups.
In bluewave.c mostly.  There are a few places left where sprintf()
is called directly; these should be recast in terms of a stralloc
or possibly strlcat.

One small whitespace change in www_files.c.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-15 10:20:20 +10:00
Dan Cross
40570f0fd0 www cleanups.
Use ptr_vectors in the WWW code to parse mime types,
headers in POST requests, etc.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-15 10:20:14 +10:00
Andrew Pamment
e32addbe59 Merge branch 'master' of git.magickabbs.com:/home/andrew/repositories/MagickaBBS 2018-10-14 22:27:53 +10:00
Andrew Pamment
0b9bdd77d5 Fix for random crap at the end of messages
commit changes to STRINGS.CHANGES I must have forgot to commit
2018-10-14 22:27:27 +10:00
Andrew Pamment
e61ffe98c3 fix file size on web 2018-10-14 15:32:42 +10:00
Dan Cross
267dbf15b8 Clean up string logic in www_files.c.
Use stralloc() etc here.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-14 15:28:16 +10:00
Andrew Pamment
b500a450dd Couple of minor fixes
Duplicate string in www_email
fread returns number of elements read not number of bytes
Missing clear screen after my changing of strings
2018-10-14 10:46:52 +10:00
Dan Cross
303810acaa Trivial formatting cleanups
Just another clang-format run to catch regressions that
have snuck in via other patches.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-14 10:35:29 +10:00
Dan Cross
2de957db34 Modify HTML generation code to use stralloc.
Replace most remaining uses of sprintf() into a `buffer`
variable followed by realloc() and strcat() with direct
use of stralloc.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-14 10:35:23 +10:00
Dan Cross
42eb413c91 More changing formatting to use stralloc.
Specifically, change the www_last10 HTML rendering logic
to use stralloc and strftime().  This eliminates a lot of
duplication.

It would be easier to test this with a unit test if the
logic of reading the last10 entries from a file were
separated from the HTML rendering logic.  An area for
future enhancement.

Also start in on www_email.c, which is the last bastion
of significant realloc() use for page generation.  An
explicit goal is to get rid of unsafe string handling
functions such as strcpy, strcat, sprintf, etc.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-14 10:35:18 +10:00
Andrew Pamment
0ade566c11 fix for message sending 2018-10-13 20:14:31 +10:00
Andrew Pamment
0cbefa834f Merge branch 'master' of git.magickabbs.com:/home/andrew/repositories/MagickaBBS 2018-10-13 20:04:25 +10:00
Andrew Pamment
d9a350631c some fixes for area selection and message list header 2018-10-13 20:03:58 +10:00
Dan Cross
f2288e9cec More adoption of stralloc for string handling.
Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-13 10:22:44 +10:00
Dan Cross
7bf6e05170 Fix a buffer overflow in bluewave.c.
strcat()'ing a string onto the result of file2str()
will result in a buffer overflow, since file2str()
only allocates enough memory to hold the contents of
the file (plus a NUL terminator).  This happend in
`bluewave.c`.

Instead, use `file2stralloc` to read the contents of
that file into a stralloc, which we can stralloc_cats
onto without fear of overflow.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-13 10:22:40 +10:00
Dan Cross
aba49d7a20 Added file2stralloc to read a file directly into a stralloc.
Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-13 10:22:33 +10:00
Andrew Pamment
7986d00b71 another netbsd fix 2018-10-12 19:44:50 +10:00
Andrew Pamment
5b007071e3 fix netbsd makefile 2018-10-12 19:40:15 +10:00
Andrew Pamment
1541033dbd Final fix for dragonfly 2018-10-12 18:13:37 +10:00
Andrew Pamment
c3636ec6d5 More dragonfly fixes 2018-10-12 18:11:05 +10:00
Andrew Pamment
943d5c0e18 fix capitalization 2018-10-12 17:51:10 +10:00
Andrew Pamment
0b76ae3cb6 Fixes for dragonflybsd 2018-10-12 17:48:26 +10:00
Andrew Pamment
800e13009f Fix unending RE:re:re: etc 2018-10-12 17:25:30 +10:00
Andrew Pamment
d4329eb287 Makefile tweaks for sunos and macos 2018-10-12 15:58:29 +10:00
Andrew Pamment
40c52836f9 Fix a couple of bugs 2018-10-12 11:11:44 +10:00
Dan Cross
37bcd31ff2 Clean up some of the page generation logic in www_msgs.c.
More application of stralloc.  Needs to be tested.  :-)

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-12 10:13:12 +10:00
Dan Cross
0a91165b07 Clean up blog code (particularly the www side).
Make `blog_load` return a ptr_vector which is
consumed by the code that uses blog entries.
Greatly clean up WWW page generation by using
stralloc and strftime and the ptr_vector
infrastructure.

Needs to be tested. :-)

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-12 10:13:04 +10:00
Dan Cross
9b4238209e Check in a file that autotools keeps modifying.
This is a file that some component of autotools keeps
clobbering.  Check in what it produces.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-12 10:12:55 +10:00
Dan Cross
cf766e3e67 Trivial clang-format changes
Changes from a clang-format run.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-12 10:12:45 +10:00
Dan Cross
e548c94750 mail_menu.c: Remove external lines counter in editor.
The pointer vector maintaining `content` in `editor` already
keeps track of the number of lines and makes it available via
a call to `ptr_vector_len` (or one could look at th `len`
member of the ptr_vector struct...this is C, not some fancy
object oriented language with data hiding).  Delete the `lines`
local variable and just use ptr_vector_len where necessary.

Sorry; I should have done that in the first sweep through that
code.  My bad!

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-12 10:12:36 +10:00
Andrew Pamment
37e728b749 Fix for line numbers on internal editor 2018-10-11 22:04:48 +10:00
Dan Cross
d8c32639e4 Trivial whitespace cleanups
Delete trailing whitespace at the ends of lines;
ensure files have newlines at the end.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-11 21:36:35 +10:00
Dan Cross
1c7849b724 Fix a bug in stralloc_starts() and add a test.
strcalloc_starts() should have tested the return value
of `memcmp` against 0 for equality.  Fixed and added a
test case.

As an aside, one might wonder how bugs like that are
creeping into well-tested code imported from other
projects?  The answer, specific to stralloc, is that
the original code was very specific to qmail, and used
a number of additional functions specific to qmail.

Rather than import half of qmail, the version imported
into Magicka has been reworked to, instead, use
standard C functions.  The process of modifying the
code gave rise to the opportunity for bugs to creep in.
Now that a unit testing framework is in place, we can
test things in isolation more easily and hopefully
catch such things BEFORE they are published to the
master repository.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>
2018-10-11 21:36:29 +10:00