OpenBSD CVS

CVS log for src/sbin/swapctl/swapctl.c


[BACK] Up to [local] / src / sbin / swapctl

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.26 / (download) - annotate - [select for diffs], Tue Feb 11 18:16:38 2020 UTC (4 years, 3 months ago) by jca
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, HEAD
Changes since 1.25: +3 -4 lines
Diff to previous 1.25 (colored)

Initialize rejecttype to appease static analyzers

-t has already been checked in main() and can only be "blk" or "noblk",
but static analyzers like scan-build fail to spot this.  From miod@

Revision 1.25 / (download) - annotate - [select for diffs], Thu Dec 5 12:46:54 2019 UTC (4 years, 6 months ago) by mpi
Branch: MAIN
Changes since 1.24: +1 -3 lines
Diff to previous 1.24 (colored)

Remove clause #3 from mrg@NetBSD license.

In May 29 2008, Matthew R. Green removed it in NetBSD:
  github.com/IIJ-NetBSD/netbsd-src/commit/7ea20401d535da9996394136ef

ok deraadt@

Revision 1.24 / (download) - annotate - [select for diffs], Fri Jun 28 13:32:46 2019 UTC (4 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.23: +7 -7 lines
Diff to previous 1.23 (colored)

When system calls indicate an error they return -1, not some arbitrary
value < 0.  errno is only updated in this case.  Change all (most?)
callers of syscalls to follow this better, and let's see if this strictness
helps us in the future.

Revision 1.23 / (download) - annotate - [select for diffs], Thu Mar 17 19:40:43 2016 UTC (8 years, 2 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.22: +2 -2 lines
Diff to previous 1.22 (colored)

Last parameter to execl[e]() functions *must* be cast to a pointer.
Just NULL is not good practise as NULL is theoretically allowed to
be an integer rather than a pointer.

Use (char *)NULL consistently instead of scattering a few (char *)0
and (void *)NULL into the mix.

Prompted by and probably ok deraadt@ millert@ kettenis@

Definitely ok mestre@ ratchov@

Revision 1.22 / (download) - annotate - [select for diffs], Tue Sep 15 17:46:23 2015 UTC (8 years, 8 months ago) by schwarze
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.21: +2 -2 lines
Diff to previous 1.21 (colored)

update spacing in usage(); reminded by jmc@

Revision 1.21 / (download) - annotate - [select for diffs], Fri Aug 14 08:56:21 2015 UTC (8 years, 9 months ago) by semarie
Branch: MAIN
Changes since 1.20: +18 -8 lines
Diff to previous 1.20 (colored)

switch from system(3) to vfork(2)+execl(2) for invoking mount_nfs(8) when fstab
contains option for swapping to NFS files.

ok millert@

Revision 1.20 / (download) - annotate - [select for diffs], Sat Apr 18 18:28:37 2015 UTC (9 years, 1 month ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.19: +6 -3 lines
Diff to previous 1.19 (colored)

Convert many atoi() calls to strtonum(), adding range checks and failure
handling along the way.
Reviews by Brendan MacDonell, Jeremy Devenport, florian, doug, millert

Revision 1.19 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:01 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.18: +1 -3 lines
Diff to previous 1.18 (colored)

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible.  Annotate <sys/param.h> lines with their current reasons.  Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc.  Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution.  These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Revision 1.18 / (download) - annotate - [select for diffs], Wed Dec 29 12:14:41 2010 UTC (13 years, 5 months ago) by stsp
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5, OPENBSD_5_4_BASE, OPENBSD_5_4, OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.17: +6 -1 lines
Diff to previous 1.17 (colored)

Fix swapctl -A with DUIDs in /etc/fstab, and plug a small memory leak.
ok jsing@ (who also pointed out a DPADD tweak missing from my diff)

Revision 1.17 / (download) - annotate - [select for diffs], Mon Nov 26 13:36:33 2007 UTC (16 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7, OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.16: +10 -6 lines
Diff to previous 1.16 (colored)

if no arguments given, assume a nice default; ok miod jakemsr deanna

Revision 1.16 / (download) - annotate - [select for diffs], Tue Jul 17 18:26:05 2007 UTC (16 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.15: +2 -4 lines
Diff to previous 1.15 (colored)

sync swapon usage(); from Igor Zinovik

Revision 1.15 / (download) - annotate - [select for diffs], Mon Jul 16 21:05:46 2007 UTC (16 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.14: +3 -3 lines
Diff to previous 1.14 (colored)

Remove dead code and fix incorrect comment.  From Igor Zinovik.

Revision 1.14 / (download) - annotate - [select for diffs], Tue Apr 12 06:41:57 2005 UTC (19 years, 2 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0, OPENBSD_3_9_BASE, OPENBSD_3_9, OPENBSD_3_8_BASE, OPENBSD_3_8
Changes since 1.13: +5 -3 lines
Diff to previous 1.13 (colored)

handle snprintf potential -1 case

Revision 1.13 / (download) - annotate - [select for diffs], Mon Jan 12 19:46:08 2004 UTC (20 years, 5 months ago) by avsm
Branch: MAIN
CVS Tags: OPENBSD_3_7_BASE, OPENBSD_3_7, OPENBSD_3_6_BASE, OPENBSD_3_6, OPENBSD_3_5_BASE, OPENBSD_3_5
Changes since 1.12: +6 -5 lines
Diff to previous 1.12 (colored)

- avoid variable sized static array (from millert@)
- check for snprintf overflow
- errx -> err for strdup

commit #1000!

Revision 1.12 / (download) - annotate - [select for diffs], Fri Sep 26 16:09:27 2003 UTC (20 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.11: +4 -4 lines
Diff to previous 1.11 (colored)

check strdup failure; ok anil millert

Revision 1.11 / (download) - annotate - [select for diffs], Mon Mar 3 13:41:23 2003 UTC (21 years, 3 months ago) by miod
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE, OPENBSD_3_4, OPENBSD_3_3_BASE, OPENBSD_3_3
Changes since 1.10: +4 -5 lines
Diff to previous 1.10 (colored)

Fix inaccuracies in comments.

Revision 1.10 / (download) - annotate - [select for diffs], Wed Jul 3 22:32:33 2002 UTC (21 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE, OPENBSD_3_2
Changes since 1.9: +8 -15 lines
Diff to previous 1.9 (colored)

ansi

Revision 1.9 / (download) - annotate - [select for diffs], Wed May 15 23:30:08 2002 UTC (22 years ago) by art
Branch: MAIN
Changes since 1.8: +2 -2 lines
Diff to previous 1.8 (colored)

typo in comment.
From Sam Smith S at mSmith.net

Revision 1.8 / (download) - annotate - [select for diffs], Wed May 15 23:24:43 2002 UTC (22 years ago) by art
Branch: MAIN
Changes since 1.7: +1 -11 lines
Diff to previous 1.7 (colored)

Kill commented out stubs for swapoff.

Revision 1.7 / (download) - annotate - [select for diffs], Sat Feb 16 21:27:38 2002 UTC (22 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE, OPENBSD_3_1
Changes since 1.6: +9 -9 lines
Diff to previous 1.6 (colored)

Part one of userland __P removal.  Done with a simple regexp with some minor hand editing to make comments line up correctly.  Another pass is forthcoming that handles the cases that could not be done automatically.

Revision 1.6 / (download) - annotate - [select for diffs], Mon Jun 4 14:59:50 2001 UTC (23 years ago) by mickey
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE, OPENBSD_3_0
Changes since 1.5: +12 -14 lines
Diff to previous 1.5 (colored)

return from main() don't exit

Revision 1.5 / (download) - annotate - [select for diffs], Sat Jun 2 03:04:44 2001 UTC (23 years ago) by miod
Branch: MAIN
Changes since 1.4: +34 -20 lines
Diff to previous 1.4 (colored)

Various swapctl(8) improvements:
- don't print an error message when trying to enable swap on an
  already active swap point.
- better handling of -t option.
- silently ignores swap points which are neither block devices nor
  regular files, and don't consider swap points not starting with /dev/
  as valid block devices, when invoked with -A.

Work by deraadt@ and myself, ok millert@

Revision 1.4 / (download) - annotate - [select for diffs], Fri Mar 9 03:13:48 2001 UTC (23 years, 3 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE, OPENBSD_2_9
Changes since 1.3: +3 -3 lines
Diff to previous 1.3 (colored)

PATH_MAX+1 is wrong.  Not cranking libc/libc_r majors over this, since they just got cranked a little while ago. discussion with millert

Revision 1.2.2.1 / (download) - annotate - [select for diffs], Fri Oct 6 20:40:27 2000 UTC (23 years, 8 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.2: +2 -2 lines
Diff to previous 1.2 (colored) next main 1.3 (colored)

Pull in patch from current (more to come...):
Fix (millert):
warnx?/errx? paranoia (use "%s" not a bare string unless it is a
constant).  These are not security holes but it is worth fixing
them anyway both for robustness and so folks looking for examples
in the tree are not misled into doing something potentially dangerous.
Furthermore, it is a bad idea to assume that pathnames will not
include '%' in them and that error routines don't return strings
with '%' in them (especially in light of the possibility of locales).

Revision 1.3 / (download) - annotate - [select for diffs], Fri Jun 30 16:00:09 2000 UTC (23 years, 11 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE, OPENBSD_2_8
Changes since 1.2: +2 -2 lines
Diff to previous 1.2 (colored)

warnx?/errx? paranoia (use "%s" not a bare string unless it is a
constant).  These are not security holes but it is worth fixing
them anyway both for robustness and so folks looking for examples
in the tree are not misled into doing something potentially dangerous.
Furthermore, it is a bad idea to assume that pathnames will not
include '%' in them and that error routines don't return strings
with '%' in them (especially in light of the possibility of locales).

Revision 1.2 / (download) - annotate - [select for diffs], Sat Feb 26 04:06:23 2000 UTC (24 years, 3 months ago) by hugh
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE
Branch point for: OPENBSD_2_7
Changes since 1.1: +1 -0 lines
Diff to previous 1.1 (colored)

add rcs idents

Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Sat May 22 21:33:14 1999 UTC (25 years ago) by weingart
Branch: VMSWAP1_TAG
CVS Tags: VMSWAP2_TAG, OPENBSD_2_6_BASE, OPENBSD_2_6
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)

Initial import of swapctl(8).

Revision 1.1 / (download) - annotate - [select for diffs], Sat May 22 21:33:14 1999 UTC (25 years ago) by weingart
Branch: MAIN

Initial revision

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.