ngIRCd GIT Updates

Diskussionsstrang Neuen Diskussionsstrang anfangen

Herunterladen

ngircd-commits@lists.barton.de

Mai 2011

2 Teilnehmer
2 Diskussionen

Alexander Barton : Mac OS X: split up make targets
by alex＠arthur.barton.de 12 Mai '11

12 Mai '11

Module: ngircd.git Branch: master Commit: dd7d64f577633d68a11b6dc0e97ec00df0645343 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dd7d64f5… Author: Alexander Barton <alex(a)barton.de> Date: Thu May 12 00:21:18 2011 +0200 Mac OS X: split up make targets New targets are: "have-packagemaker", "osxpkg-dest" --- .gitignore | 1 + Makefile.am | 28 +++++++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 96642fb..1990041 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ debian depcomp install-sh missing +ngircd.dest .deps *.a *.o diff --git a/Makefile.am b/Makefile.am index e1d8d60..58f202c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) +# Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,6 +37,10 @@ have-xcodebuild: >/dev/null 2>&1 \ || ( echo; echo "Error: \"xcodebuild\" not found!"; echo; exit 1 ) +have-packagemaker: + @packagemaker >/dev/null 2>&1; [ $$? -le 1 ] \ + || ( echo; echo "Error: \"packagemaker\" not found!"; echo; exit 2) + xcode: have-xcodebuild rel=`git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'`; \ def="GCC_PREPROCESSOR_DEFINITIONS=\"VERSION=\\\"$$rel\\\"\""; \ @@ -55,10 +59,15 @@ deb: [ -f debian/rules ] || ln -s contrib/Debian debian dpkg-buildpackage -rfakeroot -i -osxpkg: have-xcodebuild - @packagemaker >/dev/null 2>&1; [ $$? -le 1 ] \ - || ( echo; echo "Error: \"packagemaker\" not found!"; echo; exit 2) - make clean +osxpkg: have-packagemaker osxpkg-dest + cd contrib/MacOSX && packagemaker \ + --doc ngIRCd.pmdoc \ + --out ../../$(distdir).mpkg + rm -f $(distdir).mpkg.zip + zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg + rm -rf ngircd.dest $(distdir).mpkg + +osxpkg-dest: have-xcodebuild clean ./configure --prefix=/opt/ngircd make xcode make -C contrib/MacOSX de.barton.ngircd.plist @@ -71,11 +80,8 @@ osxpkg: have-xcodebuild rm ngircd.dest/opt/ngircd/etc/ngircd.conf echo "Have a nice day IRCing!" >ngircd.dest/opt/ngircd/etc/ngircd.motd chmod -R a-s,og-w,a+rX ngircd.dest - cd contrib/MacOSX && packagemaker \ - --doc ngIRCd.pmdoc \ - --out ../../$(distdir).mpkg - rm -f $(distdir).mpkg.zip - zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg - rm -rf ngircd.dest $(distdir).mpkg + +.PHONY: deb have-packagemaker have-xcodebuild lint osxpkg osxpkg-dest rpm \ + srcdoc testsuite xcode xcode-clean # -eof-

1 0

Florian Westphal : fix clang warning about dead stores
by fw＠arthur.barton.de 12 Mai '11

12 Mai '11

Module: ngircd.git Branch: master Commit: 605b6a67bc7f41432d25ab646c232e347fd7a33f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=605b6a67… Author: Florian Westphal <fw(a)strlen.de> Date: Fri May 6 20:31:56 2011 +0200 fix clang warning about dead stores clang 'scan-build': Value stored to 'r' is never read Value stored to 'fd' is never read --- src/ngircd/irc-channel.c | 2 ++ src/ngircd/ngircd.c | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 476c313..66b3eeb 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -526,6 +526,8 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) Client_ID(Client), Channel_Name(chan), topic); #ifndef STRICT_RFC + if (!r) + return r; r = IRC_WriteStrClient(from, RPL_TOPICSETBY_MSG, Client_ID(Client), Channel_Name(chan), diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 4cac909..58383cf 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -706,10 +706,8 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) /* Detach stdin, stdout and stderr */ Setup_FDStreams(fd); - if (fd > 2) { + if (fd > 2) close(fd); - fd = -1; - } } pid = getpid();

1 0