[prev in list] [next in list] [prev in thread] [next in thread] 

List:       trousers-tech
Subject:    Re: [TrouSerS-tech] Patches for Trousers?
From:       Wyllys Ingersoll <wyllys.ingersoll () sun ! com>
Date:       2008-12-05 19:29:57
Message-ID: 49398135.8080403 () sun ! com
[Download RAW message or body]

OK, thanks.   I am preparing to put Trousers-0.3.1 into
Solaris (modulo the patches I am submitting).  As the patches get 
integrated into the
main tree, I will remove them from our build process.

Currently, all of  my patches were made against the 0.3.1 tarball since 
that is what
we build against.

Attached is the first one, if the format is not correct, I can re-make them
and submit again.  These are done as context-diffs (diff -c).

If this is OK, I will send the rest along shortly.

-Wyllys




Rajiv Andrade wrote:
> Hi Wyllys,
>
> You can send it right here, preferably patches that apply on top of the
> current git tree (mirrored from the cvs tree):
>
> http://git.infradead.org/trousers/trousers.git
>
> I also plan to release a new version soon.
>
> Thanks!
>
>
> On Fri, 2008-12-05 at 13:41 -0500, Wyllys Ingersoll wrote:
>   
>> What is the process for submitting patches/fixes to be included in
>> future releases of Trousers?  I have a handful of changes, mostly minor,
>> that make it build and run correctly on Solaris and was hoping to get
>> them incorporated in the main tree if possible.  The Solaris-centric
>> stuff is "#ifdef __sun__" to avoid breaking other builds.
>>
>> -Wyllys Ingersoll
>>
>>
>> ------------------------------------------------------------------------------
>> SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
>> The future of the web can't happen without you.  Join us at MIX09 to help
>> pave the way to the Next Web now. Learn more and register at
>> http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
>> _______________________________________________
>> TrouSerS-tech mailing list
>> TrouSerS-tech@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/trousers-tech
>>     


["platform.c.patch" (text/plain)]

*** src/tcds/platform.c.old	Tue Jul 17 11:29:14 2007
--- src/tcsd/platform.c	Fri Dec  5 09:10:52 2008
***************
*** 30,36 ****
--- 30,40 ----
  {
  	char runlevel;
  	struct utmp ut, save, *next = NULL;
+ #ifdef __sun__
+ 	time_t tv = 0;
+ #else
  	struct timeval tv;
+ #endif /* __sun__ */
  	int flag = 0, counter = 0;
  
  	MUTEX_LOCK(utmp_lock);
***************
*** 37,43 ****
--- 41,49 ----
  
  	memset(&ut, 0, sizeof(struct utmp));
  	memset(&save, 0, sizeof(struct utmp));
+ #ifndef __sun__
  	memset(&tv, 0, sizeof(struct timeval));
+ #endif
  
  	ut.ut_type = RUN_LVL;
  
***************
*** 44,57 ****
--- 50,69 ----
  	next = getutid(&ut);
  
  	while (next != NULL) {
+ #ifdef __sun__
+ 		if (next->ut_time >= tv) {
+ #else
  		if (next->ut_tv.tv_sec > tv.tv_sec) {
+ #endif
  			memcpy(&save, next, sizeof(*next));
  			flag = 1;
+ #ifndef __sun__
  		} else if (next->ut_tv.tv_sec == tv.tv_sec) {
  			if (next->ut_tv.tv_usec > tv.tv_usec) {
  				memcpy(&save, next, sizeof(*next));
  				flag = 1;
  			}
+ #endif /* __sun__ */
  		}
  
  		counter++;


------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/

_______________________________________________
TrouSerS-tech mailing list
TrouSerS-tech@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/trousers-tech


[prev in list] [next in list] [prev in thread] [next in thread]