From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 81766 invoked by alias); 24 Nov 2015 07:32:32 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 81746 invoked by uid 10114); 24 Nov 2015 07:32:31 -0000 Date: Tue, 24 Nov 2015 07:32:00 -0000 Message-ID: <20151124073231.81720.qmail@sourceware.org> From: mgeisert@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [cygutils] branch master, updated. v1_4_15-1-gc40468c X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: c3bb28d5d9a59bfc809b91d8205cd27a76f823cd X-Git-Newrev: c40468c023afa487d6c5ace0a541a319919b50fd X-SW-Source: 2015-q4/txt/msg00012.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-cygutils.git;h=c40468c023afa487d6c5ace0a541a319919b50fd commit c40468c023afa487d6c5ace0a541a319919b50fd Author: Mark Geisert Date: Mon Nov 23 23:31:19 2015 -0800 1.4.15a minor fixes Diff: --- ChangeLog | 7 ++++ cygutils.cygport | 71 +++++++++++++++++++++++++++++++++++++++++ src/conv/conv.c | 1 + src/ipc/shmtool.c | 92 ++++++++++++++++++++++++++-------------------------- 4 files changed, 125 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 620dec0..7271f8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-11-23 Mark Geisert + + * src/conv/conv.c: Add "#include " to avoid compiler warning. + * src/ipc/shmtool.c: Reorder functions to avoid compiler warnings. + * cygutils.cygport: Added. + * cygutils.cygport: Correct description text for all 3 packages. + 2015-11-03 Mark Geisert Release 1.4.15 diff --git a/cygutils.cygport b/cygutils.cygport new file mode 100755 index 0000000..c9ac76d --- /dev/null +++ b/cygutils.cygport @@ -0,0 +1,71 @@ +NAME=cygutils +VERSION=1.4.15 +RELEASE=2 + +SUMM="A collection of simple utilities" +DESC="A collection of simple (single source file) utilities, including" + +HOMEPAGE="http://cygutils.fruitbat.org/cygutils-package/index.html" +GIT_URI="git://cygwin.com/git/cygwin-cygutils.git" +GIT_TAG="v1_4_15a" + inherit git + +PKG_NAMES="cygutils cygutils-extra cygutils-x11" + +cygutils_CATEGORY=Base +cygutils_SUMMARY="${SUMM} (core collection)" +cygutils_DESCRIPTION="${DESC} +cygstart, mkshortcut, and readshortcut." +cygutils_CONTENTS='usr/bin/cygstart.exe + usr/bin/mkshortcut.exe + usr/bin/readshortcut.exe + usr/share/doc/cygutils/[A-Z]* + usr/share/doc/cygutils/licenses + usr/share/man/man1/cygstart.1* + usr/share/man/man1/mkshortcut.1* + usr/share/man/man1/readshortcut.1*' + +cygutils_extra_CATEGORY=Utils +cygutils_extra_SUMMARY="${SUMM} (other tools)" +cygutils_extra_DESCRIPTION="${DESC} +banner, conv, cygdrop, cygicons, dump (a hexdumper), getclip, +ipck, lpr, msgtool, putclip, semstat, semtool, shmtool, and winln." +cygutils_extra_CONTENTS='usr/bin/banner.exe + usr/bin/conv.exe + usr/bin/cygdrop.exe + usr/bin/cygicons-0.dll + usr/bin/dump.exe + usr/bin/getclip.exe + usr/bin/ipck + usr/bin/lpr.exe + usr/bin/msgtool.exe + usr/bin/putclip.exe + usr/bin/semstat.exe + usr/bin/semtool.exe + usr/bin/shmtool.exe + usr/bin/winln.exe + usr/include + usr/lib + usr/share/doc/cygutils/cygicons + usr/share/doc/cygutils/lpr + usr/share/man/man1/lpr.1* + usr/share/man/man1/winln.1*' + +cygutils_x11_CATEGORY=X11 +cygutils_x11_SUMMARY="${SUMM} (X11 integration)" +cygutils_x11_DESCRIPTION="${DESC} +a cygstart app and a cygutils app." +cygutils_x11_CONTENTS='etc/postinstall/cygutils.sh + usr/share/applications/cygstart.desktop + usr/share/mime/packages/cygutils.xml' + +DIFF_EXCLUDES="-x m4 -x build-aux -x Makefile.in -x aclocal.m4 -x configure" + +src_compile() { + cd ${S} + ./bootstrap + cd ${B} + cygconf --enable-silent-rules + cygmake +} + diff --git a/src/conv/conv.c b/src/conv/conv.c index b21d6da..0a01576 100755 --- a/src/conv/conv.c +++ b/src/conv/conv.c @@ -30,6 +30,7 @@ #endif #include "common.h" +#include // for _setmode static const char versionID[] = PACKAGE_VERSION; static const char revID[] = diff --git a/src/ipc/shmtool.c b/src/ipc/shmtool.c index 8b4f6d3..70b4c41 100644 --- a/src/ipc/shmtool.c +++ b/src/ipc/shmtool.c @@ -39,6 +39,52 @@ #define SEGSIZE 100 +usage () +{ + fprintf (stderr, "shmtool - A utility for tinkering with shared memory\n"); + fprintf (stderr, "\nUSAGE: shmtool (w)rite \n"); + fprintf (stderr, " (r)ead\n"); + fprintf (stderr, " (d)elete\n"); + fprintf (stderr, " (m)ode change \n"); + exit (1); +} + +writeshm (int shmid, char *segptr, char *text) +{ + strcpy (segptr, text); + printf ("Done...\n"); +} + +readshm (int shmid, char *segptr) +{ + printf ("segptr: %s\n", segptr); +} + +removeshm (int shmid) +{ + shmctl (shmid, IPC_RMID, 0); + printf ("Shared memory segment marked for deletion\n"); +} + +changemode (int shmid, char *mode) +{ + struct shmid_ds myshmds; + + /* Get current values for internal data structure */ + shmctl (shmid, IPC_STAT, &myshmds); + + /* Display old permissions */ + printf ("Old permissions were: %o\n", myshmds.shm_perm.mode); + + /* Convert and load the mode */ + sscanf (mode, "%o", &myshmds.shm_perm.mode); + + /* Update the mode */ + shmctl (shmid, IPC_SET, &myshmds); + + printf ("New permissions are : %o\n", myshmds.shm_perm.mode); +} + main (int argc, char *argv[]) { key_t key; @@ -94,49 +140,3 @@ main (int argc, char *argv[]) } } - -writeshm (int shmid, char *segptr, char *text) -{ - strcpy (segptr, text); - printf ("Done...\n"); -} - -readshm (int shmid, char *segptr) -{ - printf ("segptr: %s\n", segptr); -} - -removeshm (int shmid) -{ - shmctl (shmid, IPC_RMID, 0); - printf ("Shared memory segment marked for deletion\n"); -} - -changemode (int shmid, char *mode) -{ - struct shmid_ds myshmds; - - /* Get current values for internal data structure */ - shmctl (shmid, IPC_STAT, &myshmds); - - /* Display old permissions */ - printf ("Old permissions were: %o\n", myshmds.shm_perm.mode); - - /* Convert and load the mode */ - sscanf (mode, "%o", &myshmds.shm_perm.mode); - - /* Update the mode */ - shmctl (shmid, IPC_SET, &myshmds); - - printf ("New permissions are : %o\n", myshmds.shm_perm.mode); -} - -usage () -{ - fprintf (stderr, "shmtool - A utility for tinkering with shared memory\n"); - fprintf (stderr, "\nUSAGE: shmtool (w)rite \n"); - fprintf (stderr, " (r)ead\n"); - fprintf (stderr, " (d)elete\n"); - fprintf (stderr, " (m)ode change \n"); - exit (1); -}