svn commit: r334540 - head/usr.bin/top

[Eitan Adler]

On 2 June 2018 at 23:51, Rodney W. Grimes
<freebsd at pdx.rh.cn85.dnsmgr.net> wrote:
> [ Charset UTF-8 unsupported, converting... ]
>> On 2 June 2018 at 21:14, Rodney W. Grimes
>> <freebsd at pdx.rh.cn85.dnsmgr.net> wrote:
>> >> On 2 June 2018 at 16:53, Rodney W. Grimes
>> >> <freebsd at pdx.rh.cn85.dnsmgr.net> wrote:
>> >> > [ Charset UTF-8 unsupported, converting... ]
>> >> >> Author: eadler
>> >> >> Date: Sat Jun  2 21:40:45 2018
>> >> >> New Revision: 334540
>> >> >> URL: https://svnweb.freebsd.org/changeset/base/334540
>> >> >>
>> >> >> Log:
>> >> >>   top(1): cleanup memory allocation and warnings
>> >> >>
>> >> >>   - Prefer calloc over malloc. This is more predicable and we're not in a
>> >> >>   performance sensitive context. [1]
>> >> >>   - Remove bogus comment (obsolete from prior commit). [2]
>> >> >>   - Remove void casts and type casts of NULL
>> >> >>   - Remove redundant declaration of 'quit'
>> >> >>   - Add additional const
>> >> >>
>> >> >>   Reported by:        kib [1], vangyzen [2]
>> >> >>
>> >> >> Modified:
>> >> >>   head/usr.bin/top/display.c
>> >> >>   head/usr.bin/top/machine.c
>> >> >>   head/usr.bin/top/screen.c
>> >> >>   head/usr.bin/top/screen.h
>> >> >>   head/usr.bin/top/utils.c
>> >> > ...
>> >> >
>> >> >>
>> >> >> Modified: head/usr.bin/top/screen.c
>> >> >> ==============================================================================
>> >> >> --- head/usr.bin/top/screen.c Sat Jun  2 21:16:20 2018        (r334539)
>> >> >> +++ head/usr.bin/top/screen.c Sat Jun  2 21:40:45 2018        (r334540)
>> >> >> @@ -3,7 +3,7 @@
>> >> >>   *  Version 3
>> >> >>   *
>> >> >>   *  This program may be freely redistributed,
>> >> >> - *  but this entire comment MUST remain intact.
>> >> >> + *  but this entire ceomment MUST remain intact.
>> >> >
>> >> > I know you have already fixed this spelling error,
>> >> > but I believe there are some other commits that actually
>> >> > removed either this string, or some part of "this entire"
>> >> > comment that is to "remain intact".
>> >>
>> >> I just went through my commits to top(1) and don't see any others. Did
>> >> I miss any?
>> >
>> > Index: commands.c
>> > ===================================================================
>> > --- commands.c  (revision 333898)
>> > +++ commands.c  (working copy)
>> > @@ -1,6 +1,5 @@
>> >  /*
>> >   *  Top users/processes display for Unix
>> > - *  Version 3
>> >   *
>> >   *  This program may be freely redistributed,
>> >   *  but this entire comment MUST remain intact.
>> >
>> > Found with a cd usr.bin/top; svn diff -r 333898 which is
>> > when you moved it to usr.bin.  Further investigation
>> > shows that this line was deleted at r333909.
>>
>> I removed the version line, not the license line. Do you believe
>> "entire comment" includes the version information?
>
> I would interpret entire to be anything between /* and */.

Sorry about the delay in responding: there was some ongoing
conversations with core@ about the licensing of top(1). While that
assertion isn't clear, I also don't think it's harmful to restore.
I'll do so in my next pass.



-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams