Changeset 5945:513aedefab60 in roaraudio
- Timestamp:
- 10/15/13 13:33:26 (11 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r5943 r5945 1 v. 1.0beta11 - ? 2 * Updated checks on commandlion parameters 3 (Closes: DEB#716264, DEB#716251, DEB#716245, DEB#716240) 4 1 5 v. 1.0beta10 - Tue Oct 15 2013 12:03 CEST 2 6 Prereleases: 0: Mon Sep 30 2013 21:15 CEST -
include/libroar/libroar.h
r5823 r5945 205 205 #define ROAR_MIN ROAR_MIN2 206 206 207 #define ROAR_CKHAVEARGS(x) if ( (i + (x)) >= argc ) { \ 208 ROAR_ERR("Option %s requires more arguments. See --help for more details.", k); \ 209 return 70; \ 210 } 211 207 212 int roar_usleep(uint_least32_t t); 208 213 int roar_sleep(int t); -
roarclients/roarclientpass.c
r5823 r5945 152 152 153 153 if ( !strcmp(k, "--server") || !strcmp(k, "-s") ) { 154 ROAR_CKHAVEARGS(1); 154 155 server = argv[++i]; 155 156 } else if ( !strcmp(k, "--stdin") ) { … … 162 163 cflags |= F_STDIN|F_STDOUT; 163 164 } else if ( !strcmp(k, "--client-fh") ) { 165 ROAR_CKHAVEARGS(1); 164 166 clientfh = atoi(argv[++i]); 165 167 } else if ( !strcmp(k, "--proto") ) { 168 ROAR_CKHAVEARGS(1); 166 169 proto = roar_str2proto(argv[++i]); 167 170 } else if ( !strcmp(k, "--byteorder") ) { 171 ROAR_CKHAVEARGS(1); 168 172 byteorder = roar_str2byteorder(argv[++i]); 169 173 } else if ( !strcmp(k, "--listen") ) { 170 174 flags |= ROAR_CLIENTPASS_FLAG_LISTEN; 171 175 } else if ( !strcmp(k, "--command") ) { 176 ROAR_CKHAVEARGS(1); 172 177 k = argv[++i]; 173 178 if ( !strcasecmp(k, "passfh") ) { … … 180 185 } 181 186 } else if ( !strcmp(k, "--mode") ) { 187 ROAR_CKHAVEARGS(1); 182 188 k = argv[++i]; 183 189 if ( !strcasecmp(k, "none") ) { … … 195 201 } 196 202 } else if ( !strcmp(k, "--bind") ) { 203 ROAR_CKHAVEARGS(1); 197 204 host = argv[++i]; 198 205 } else if ( !strcmp(k, "--port") ) { 206 ROAR_CKHAVEARGS(1); 199 207 port = atoi(argv[++i]); 200 208 } else if ( !strcmp(k, "--help") || !strcmp(k, "-h") ) { -
roarclients/roardtmf.c
r5823 r5945 78 78 79 79 if ( !strcmp(k, "--server") || !strcmp(k, "-s") ) { 80 ROAR_CKHAVEARGS(1); 80 81 server = argv[++i]; 81 82 } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) { 83 ROAR_CKHAVEARGS(1); 82 84 rate = roar_str2rate(argv[++i]); 83 85 } else if ( !strcmp(k, "--mode-dtmf") ) { -
roarclients/roarinterconnect.c
r5823 r5945 280 280 281 281 if ( strcmp(k, "--server") == 0 ) { 282 ROAR_CKHAVEARGS(1); 282 283 server = argv[++i]; 283 284 } else if ( strcmp(k, "--remote") == 0 ) { 285 ROAR_CKHAVEARGS(1); 284 286 remote = argv[++i]; 285 287 } else if ( strcmp(k, "--type") == 0 ) { 288 ROAR_CKHAVEARGS(1); 286 289 type = parse_type(argv[++i]); 287 290 } else if ( strcmp(k, "--rate") == 0 || strcmp(k, "-R") == 0 ) { 291 ROAR_CKHAVEARGS(1); 288 292 info.rate = roar_str2rate(argv[++i]); 289 293 } else if ( strcmp(k, "--bits") == 0 || strcmp(k, "-B") == 0 ) { 294 ROAR_CKHAVEARGS(1); 290 295 info.bits = roar_str2bits(argv[++i]); 291 296 } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 || strcmp(k, "-C") == 0 ) { 297 ROAR_CKHAVEARGS(1); 292 298 info.channels = roar_str2channels(argv[++i]); 293 299 } else if ( strcmp(k, "--codec") == 0 || strcmp(k, "-E") == 0 ) { 300 ROAR_CKHAVEARGS(1); 294 301 info.codec = roar_str2codec(argv[++i]); 295 302 } else if ( !strcmp(k, "--aiprofile") ) { 303 ROAR_CKHAVEARGS(1); 296 304 if ( roar_profile2info(&info, argv[++i]) == -1 ) { 297 305 fprintf(stderr, "Error: Can not load audio profile: %s: %s\n", argv[i], roar_error2str(roar_error)); -
roarclients/roarlight.c
r5934 r5945 139 139 140 140 } else if ( !strcmp(k, "sleep") ) { 141 ROAR_CKHAVEARGS(1); 141 142 roar_sleep(atoi(argv[++i])); 142 143 143 144 } else if ( !strcmp(k, "sset") || !strcmp(k, "set") ) { 145 ROAR_CKHAVEARGS(1); 144 146 i++; 145 147 if ( cmd_sset(argv[i]) == -1 ) { … … 149 151 } 150 152 } else if ( !strcmp(k, "event") ) { 153 ROAR_CKHAVEARGS(1); 151 154 i++; 152 155 if ( cmd_event(argv[i]) == -1 ) { … … 250 253 251 254 if ( !strcmp(k, "--server") || !strcmp(k, "-s") ) { 255 ROAR_CKHAVEARGS(1); 252 256 server = argv[++i]; 253 257 } else if ( !strcmp(k, "--mixer") ) { 258 ROAR_CKHAVEARGS(1); 254 259 mixer = atoi(argv[++i]); 255 260 } else if ( !strcmp(k, "--codec") ) { -
roard/roard.c
r5837 r5945 1303 1303 // MAIN: 1304 1304 1305 #define _CKHAVEARGS(x) if ( (i + (x)) >= argc ) { \1306 ROAR_ERR("Option %s requires more arguments. See --help for more details.", k); \1307 return 70; \1308 }1309 1310 1305 #ifdef ROAR_HAVE_MAIN_ARGS 1311 1306 int main (int argc, char * argv[]) { … … 1595 1590 1596 1591 } else if ( strcmp(k, "--print-format") == 0 ) { 1597 _CKHAVEARGS(1);1592 ROAR_CKHAVEARGS(1); 1598 1593 1599 1594 } else if ( strcmp(k, "--terminate") == 0 ) { … … 1604 1599 realtime++; 1605 1600 } else if ( strcmp(k, "--memlock") == 0 ) { 1606 _CKHAVEARGS(1);1601 ROAR_CKHAVEARGS(1); 1607 1602 g_config->memlock_level = memlock_str2level(argv[++i]); 1608 1603 } else if ( strcmp(k, "--watchdog") == 0 ) { … … 1610 1605 watchdog_time = -1; 1611 1606 } else if ( strcmp(k, "--watchdog-time") == 0 ) { 1612 _CKHAVEARGS(1);1607 ROAR_CKHAVEARGS(1); 1613 1608 watchdog_time = atoi(argv[++i]); 1614 1609 } else if ( strcmp(k, "--chroot") == 0 ) { 1615 _CKHAVEARGS(1);1610 ROAR_CKHAVEARGS(1); 1616 1611 #ifdef ROAR_HAVE_CHROOT 1617 1612 chrootdir = argv[++i]; … … 1633 1628 #endif 1634 1629 } else if ( strcmp(k, "--location") == 0 ) { 1635 _CKHAVEARGS(1);1630 ROAR_CKHAVEARGS(1); 1636 1631 g_config->location = argv[++i]; 1637 1632 } else if ( strcmp(k, "--description") == 0 ) { 1638 _CKHAVEARGS(1);1633 ROAR_CKHAVEARGS(1); 1639 1634 g_config->description = argv[++i]; 1640 1635 } else if ( strcmp(k, "--contact") == 0 ) { 1641 _CKHAVEARGS(1);1636 ROAR_CKHAVEARGS(1); 1642 1637 g_config->contact = argv[++i]; 1643 1638 } else if ( strcmp(k, "--serial") == 0 ) { 1644 _CKHAVEARGS(1);1639 ROAR_CKHAVEARGS(1); 1645 1640 g_config->serial = argv[++i]; 1646 1641 } else if ( strcmp(k, "--uiurl") == 0 ) { 1647 _CKHAVEARGS(1);1642 ROAR_CKHAVEARGS(1); 1648 1643 g_config->uiurl = argv[++i]; 1649 1644 } else if ( strcmp(k, "--pidfile") == 0 ) { 1650 _CKHAVEARGS(1);1645 ROAR_CKHAVEARGS(1); 1651 1646 #ifdef SUPPORT_PIDFILE 1652 1647 pidfile = argv[++i]; … … 1662 1657 #endif 1663 1658 } else if ( strcmp(k, "--script-postdown") == 0 ) { 1664 _CKHAVEARGS(1);1659 ROAR_CKHAVEARGS(1); 1665 1660 #ifdef ROAR_HAVE_SYSTEM 1666 1661 g_config->scripts.post_shutdown = argv[++i]; … … 1672 1667 1673 1668 } else if ( strcmp(k, "--plugin-load") == 0 ) { 1674 _CKHAVEARGS(1);1669 ROAR_CKHAVEARGS(1); 1675 1670 if ( plugins_load(argv[++i], plugin_args) == -1 ) { 1676 1671 ROAR_ERR("Can not load plugin"); … … 1678 1673 plugin_args = NULL; 1679 1674 } else if ( strcmp(k, "--plugin-args") == 0 ) { 1680 _CKHAVEARGS(1);1675 ROAR_CKHAVEARGS(1); 1681 1676 plugin_args = argv[++i]; 1682 1677 } else if ( strcmp(k, "--list-plugins") == 0 ) { … … 1684 1679 1685 1680 } else if ( strcmp(k, "--guest-acclev") == 0 ) { 1686 _CKHAVEARGS(1);1681 ROAR_CKHAVEARGS(1); 1687 1682 none_acclev = clients_str2acclev(argv[++i]); 1688 1683 if ( none_acclev == -1 ) { … … 1691 1686 } 1692 1687 } else if ( strcmp(k, "--trust-acclev") == 0 ) { 1693 _CKHAVEARGS(1);1688 ROAR_CKHAVEARGS(1); 1694 1689 trust_acclev = clients_str2acclev(argv[++i]); 1695 1690 if ( trust_acclev == -1 ) { … … 1703 1698 1704 1699 } else if ( strcmp(k, "--authfile-gen") == 0 ) { 1705 _CKHAVEARGS(1);1700 ROAR_CKHAVEARGS(1); 1706 1701 af_file = argv[++i]; 1707 1702 af_mode = AF_MODE_GEN; 1708 1703 } else if ( strcmp(k, "--authfile-load") == 0 ) { 1709 _CKHAVEARGS(1);1704 ROAR_CKHAVEARGS(1); 1710 1705 af_file = argv[++i]; 1711 1706 af_mode = AF_MODE_LOAD; 1712 1707 } else if ( strcmp(k, "--authfile-type") == 0 ) { 1713 _CKHAVEARGS(1);1708 ROAR_CKHAVEARGS(1); 1714 1709 af_type = argv[++i]; 1715 1710 } else if ( strcmp(k, "--authfile-acclev") == 0 ) { 1716 _CKHAVEARGS(1);1711 ROAR_CKHAVEARGS(1); 1717 1712 af_acclev = clients_str2acclev(argv[++i]); 1718 1713 } else if ( strcmp(k, "--new-authfile") == 0 ) { … … 1732 1727 1733 1728 } else if ( strcmp(k, "-R") == 0 || strcmp(k, "--rate") == 0 ) { 1734 _CKHAVEARGS(1);1729 ROAR_CKHAVEARGS(1); 1735 1730 sa.rate = atoi(argv[++i]); 1736 1731 } else if ( strcmp(k, "-B") == 0 || strcmp(k, "--bits") == 0 ) { 1737 _CKHAVEARGS(1);1732 ROAR_CKHAVEARGS(1); 1738 1733 sa.bits = atoi(argv[++i]); 1739 1734 } else if ( strcmp(k, "-C") == 0 || strcmp(k, "--chans") == 0 ) { 1740 _CKHAVEARGS(1);1735 ROAR_CKHAVEARGS(1); 1741 1736 sa.channels = atoi(argv[++i]); 1742 1737 1743 1738 } else if ( strcmp(k, "--aiprofile") == 0 ) { 1744 _CKHAVEARGS(1);1739 ROAR_CKHAVEARGS(1); 1745 1740 if ( roar_profile2info(&sa, argv[++i]) == -1 ) { 1746 1741 ROAR_ERR("Unknown audio profile: %s", argv[i]); … … 1750 1745 1751 1746 } else if ( strcmp(k, "--stream-flags") == 0 ) { 1752 _CKHAVEARGS(1);1747 ROAR_CKHAVEARGS(1); 1753 1748 if ( update_stream_flags(argv[++i]) == -1 ) { 1754 1749 ROAR_ERR("Can not set stream flags"); … … 1760 1755 return 0; 1761 1756 } else if ( strcmp(k, "--rolestack-push") == 0 ) { 1762 _CKHAVEARGS(1);1757 ROAR_CKHAVEARGS(1); 1763 1758 if ( (rolestack = rolestack_parse(argv[++i])) == NULL ) { 1764 1759 ROAR_ERR("Can not parse rolestack request: %s", roar_error2str(roar_error)); … … 1778 1773 1779 1774 } else if ( strcmp(k, "-o") == 0 || strcmp(k, "--odriver") == 0 ) { 1780 _CKHAVEARGS(1);1775 ROAR_CKHAVEARGS(1); 1781 1776 o_drv = argv[++i]; 1782 1777 } else if ( strcmp(k, "-O") == 0 || strcmp(k, "--odevice") == 0 ) { 1783 _CKHAVEARGS(1);1778 ROAR_CKHAVEARGS(1); 1784 1779 o_dev = argv[++i]; 1785 1780 } else if ( strcmp(k, "-oO") == 0 ) { 1786 _CKHAVEARGS(1);1781 ROAR_CKHAVEARGS(1); 1787 1782 o_opts = argv[++i]; 1788 1783 } else if ( strcmp(k, "-oP") == 0 ) { … … 1798 1793 1799 1794 } else if ( strcmp(k, "-s") == 0 || strcmp(k, "--source") == 0 ) { 1800 _CKHAVEARGS(1);1795 ROAR_CKHAVEARGS(1); 1801 1796 #ifndef ROAR_WITHOUT_DCOMP_SOURCES 1802 1797 s_drv = argv[++i]; … … 1806 1801 #endif 1807 1802 } else if ( strcmp(k, "-S") == 0 ) { 1808 _CKHAVEARGS(1);1803 ROAR_CKHAVEARGS(1); 1809 1804 #ifndef ROAR_WITHOUT_DCOMP_SOURCES 1810 1805 s_dev = argv[++i]; … … 1814 1809 #endif 1815 1810 } else if ( strcmp(k, "-sO") == 0 ) { 1816 _CKHAVEARGS(1);1811 ROAR_CKHAVEARGS(1); 1817 1812 #ifndef ROAR_WITHOUT_DCOMP_SOURCES 1818 1813 s_opt = argv[++i]; … … 1822 1817 #endif 1823 1818 } else if ( strcmp(k, "-sC") == 0 ) { 1824 _CKHAVEARGS(1);1819 ROAR_CKHAVEARGS(1); 1825 1820 #ifndef ROAR_WITHOUT_DCOMP_SOURCES 1826 1821 s_con = argv[++i]; … … 1856 1851 1857 1852 } else if ( strcmp(k, "-m") == 0 || strcmp(k, "--mixer") == 0 ) { 1858 _CKHAVEARGS(1);1853 ROAR_CKHAVEARGS(1); 1859 1854 #ifndef ROAR_WITHOUT_DCOMP_MIXER 1860 1855 m_drv = argv[++i]; … … 1864 1859 #endif 1865 1860 } else if ( strcmp(k, "-M") == 0 ) { 1866 _CKHAVEARGS(1);1861 ROAR_CKHAVEARGS(1); 1867 1862 #ifndef ROAR_WITHOUT_DCOMP_MIXER 1868 1863 m_dev = argv[++i]; … … 1872 1867 #endif 1873 1868 } else if ( strcmp(k, "-mO") == 0 ) { 1874 _CKHAVEARGS(1);1869 ROAR_CKHAVEARGS(1); 1875 1870 #ifndef ROAR_WITHOUT_DCOMP_MIXER 1876 1871 m_opts = argv[++i]; … … 1907 1902 1908 1903 } else if ( strcmp(k, "--light-channels") == 0 ) { 1909 _CKHAVEARGS(1);1904 ROAR_CKHAVEARGS(1); 1910 1905 #ifndef ROAR_WITHOUT_DCOMP_LIGHT 1911 1906 light_channels = atoi(argv[++i]); … … 1916 1911 1917 1912 } else if ( strcmp(k, "--rds-pi") == 0 ) { 1918 _CKHAVEARGS(1);1913 ROAR_CKHAVEARGS(1); 1919 1914 #ifndef ROAR_WITHOUT_DCOMP_RDTCS 1920 1915 g_rdtcs.rds.pi = atoi(argv[++i]); … … 1924 1919 #endif 1925 1920 } else if ( strcmp(k, "--rds-ps") == 0 ) { 1926 _CKHAVEARGS(1);1921 ROAR_CKHAVEARGS(1); 1927 1922 #ifndef ROAR_WITHOUT_DCOMP_RDTCS 1928 1923 if ( rdtcs_rds_set_ps(argv[++i]) == -1 ) { … … 1935 1930 #endif 1936 1931 } else if ( strcmp(k, "--rds-pty") == 0 ) { 1937 _CKHAVEARGS(1);1932 ROAR_CKHAVEARGS(1); 1938 1933 #ifndef ROAR_WITHOUT_DCOMP_RDTCS 1939 1934 if ( rdtcs_rds_set_pty(argv[++i]) == -1 ) { … … 1978 1973 #endif 1979 1974 } else if ( strcmp(k, "--midi-console") == 0 ) { 1980 _CKHAVEARGS(1);1975 ROAR_CKHAVEARGS(1); 1981 1976 #ifndef ROAR_WITHOUT_DCOMP_CB 1982 1977 midi_config.console_dev = argv[++i]; … … 2001 1996 2002 1997 } else if ( strcmp(k, "--x11-display") == 0 || strcmp(k, "--display") == 0 ) { 2003 _CKHAVEARGS(1);1998 ROAR_CKHAVEARGS(1); 2004 1999 #ifdef ROAR_HAVE_LIBX11 2005 2000 x11display = argv[++i]; … … 2011 2006 2012 2007 } else if ( strcmp(k, "-p") == 0 || strcmp(k, "--port") == 0 ) { 2013 _CKHAVEARGS(1);2008 ROAR_CKHAVEARGS(1); 2014 2009 // This is only useful in INET not UNIX mode. 2015 2010 #ifdef ROAR_SUPPORT_LISTEN … … 2035 2030 #endif 2036 2031 } else if ( strcmp(k, "-b") == 0 || strcmp(k, "--bind") == 0 || strcmp(k, "--sock") == 0 ) { 2037 _CKHAVEARGS(1);2032 ROAR_CKHAVEARGS(1); 2038 2033 #ifdef ROAR_SUPPORT_LISTEN 2039 2034 sock_addr = argv[++i]; … … 2050 2045 #endif 2051 2046 } else if ( strcmp(k, "--proto-dir") == 0 ) { 2052 _CKHAVEARGS(1);2047 ROAR_CKHAVEARGS(1); 2053 2048 #ifdef ROAR_SUPPORT_LISTEN 2054 2049 if ( (sock_dir = roar_str2dir(argv[++i])) == -1 ) { … … 2060 2055 #endif 2061 2056 } else if ( strcmp(k, "--proto-rate") == 0 ) { 2062 _CKHAVEARGS(1);2057 ROAR_CKHAVEARGS(1); 2063 2058 #ifdef ROAR_SUPPORT_LISTEN 2064 2059 sock_info.rate = atoi(argv[++i]); … … 2067 2062 #endif 2068 2063 } else if ( strcmp(k, "--proto-bits") == 0 ) { 2069 _CKHAVEARGS(1);2064 ROAR_CKHAVEARGS(1); 2070 2065 #ifdef ROAR_SUPPORT_LISTEN 2071 2066 sock_info.bits = atoi(argv[++i]); … … 2074 2069 #endif 2075 2070 } else if ( strcmp(k, "--proto-chans") == 0 ) { 2076 _CKHAVEARGS(1);2071 ROAR_CKHAVEARGS(1); 2077 2072 #ifdef ROAR_SUPPORT_LISTEN 2078 2073 sock_info.channels = atoi(argv[++i]); … … 2081 2076 #endif 2082 2077 } else if ( strcmp(k, "--proto-codec") == 0 ) { 2083 _CKHAVEARGS(1);2078 ROAR_CKHAVEARGS(1); 2084 2079 #ifdef ROAR_SUPPORT_LISTEN 2085 2080 if ( (sock_info.codec = roar_str2codec(argv[++i])) == -1 ) { … … 2091 2086 #endif 2092 2087 } else if ( strcmp(k, "--proto-aiprofile") == 0 ) { 2093 _CKHAVEARGS(1);2088 ROAR_CKHAVEARGS(1); 2094 2089 #ifdef ROAR_SUPPORT_LISTEN 2095 2090 if ( roar_profile2info(&sock_info, argv[++i]) == -1 ) { … … 2106 2101 #endif 2107 2102 } else if ( strcmp(k, "--proto-profile") == 0 ) { 2108 _CKHAVEARGS(1);2103 ROAR_CKHAVEARGS(1); 2109 2104 #ifdef ROAR_SUPPORT_LISTEN 2110 2105 if ( get_listen_profile(argv[++i], &port, &sock_addr, &sock_type, &sock_proto, &sock_dir, &sock_info) == -1 ) { … … 2193 2188 2194 2189 } else if ( strcmp(k, "--jumbo-mtu") == 0 ) { 2195 _CKHAVEARGS(1);2190 ROAR_CKHAVEARGS(1); 2196 2191 g_config->jumbo_mtu = atoi(argv[++i]); 2197 2192 2198 2193 } else if ( strcmp(k, "-G") == 0 ) { 2199 _CKHAVEARGS(1);2194 ROAR_CKHAVEARGS(1); 2200 2195 sock_grp = argv[++i]; 2201 2196 } else if ( strcmp(k, "-U") == 0 ) { 2202 _CKHAVEARGS(1);2197 ROAR_CKHAVEARGS(1); 2203 2198 sock_user = argv[++i]; 2204 2199 … … 2210 2205 #endif 2211 2206 } else if ( strcmp(k, "--client-fh") == 0 ) { 2212 _CKHAVEARGS(1);2207 ROAR_CKHAVEARGS(1); 2213 2208 if ( clients_new_from_fh(atoi(argv[++i]), ROAR_PROTO_ROARAUDIO, ROAR_BYTEORDER_NETWORK, 1) == -1 ) { 2214 2209 ROAR_ERR("main(*): Can not set client's fh"); … … 2216 2211 } 2217 2212 } else if ( strcmp(k, "--close-fh") == 0 ) { 2218 _CKHAVEARGS(1);2213 ROAR_CKHAVEARGS(1); 2219 2214 #ifdef ROAR_HAVE_IO_POSIX 2220 2215 close(atoi(argv[++i]));
Note: See TracChangeset
for help on using the changeset viewer.